mvglasow
|
38e98df6cc
|
Merge commit '05cc660641' into traffic
# Conflicts:
# CMakeLists.txt
# android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
# android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp
# android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
# android/sdk/src/main/cpp/app/organicmaps/sdk/util/Config.cpp
# libs/indexer/data_source.hpp
# libs/indexer/feature.hpp
# libs/indexer/ftypes_matcher.hpp
# libs/map/framework.cpp
# libs/map/traffic_manager.cpp
# libs/routing/absent_regions_finder.cpp
# libs/routing/edge_estimator.hpp
# libs/routing/index_router.cpp
# libs/routing/index_router.hpp
# libs/routing/routing_session.hpp
# libs/routing_common/num_mwm_id.hpp
# libs/traffic/traffic_info.cpp
# qt/mainwindow.hpp
# qt/preferences_dialog.cpp
# tools/openlr/helpers.hpp
# tools/openlr/openlr_decoder.cpp
# tools/openlr/openlr_decoder.hpp
# tools/openlr/openlr_stat/openlr_stat.cpp
# tools/openlr/router.hpp
# tools/openlr/score_candidate_paths_getter.cpp
# tools/openlr/score_candidate_paths_getter.hpp
# xcode/CoMaps.xcworkspace/contents.xcworkspacedata
|
2025-09-10 21:22:40 +03:00 |
|
Osyotr
|
e00d5d33b2
|
Add missing include
Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
|
2025-08-18 09:07:05 +02:00 |
|
Konstantin Pastbin
|
bfffa1fff4
|
Format all C++ and Java code via clang-format
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
|
2025-08-17 14:32:37 +07:00 |
|
mvglasow
|
034856f033
|
Merge commit '20c9fc5f' into traffic-2025072304
# Conflicts:
# android/app/src/main/res/xml/prefs_main.xml
# qt/CMakeLists.txt
|
2025-07-28 18:27:49 +03:00 |
|
mvglasow
|
932dda6552
|
Revert "[desktop] Disable traffic switch and TrafficManager initialization."
This reverts commit 16ad61f4c8ebd22bdc282496122db49a5243f02f.
|
2025-07-28 00:33:18 +03:00 |
|
mvglasow
|
6f2f61b30a
|
Revert "[qt] Remove defunct Traffic layer button"
This reverts commit df2541e1bf12abca329becdac8de7c92f0893b03.
|
2025-07-28 00:33:08 +03:00 |
|
Konstantin Pastbin
|
5cc244de6b
|
[desktop] Rebrand desktop apps
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
|
2025-05-23 14:59:58 +07:00 |
|
Konstantin Pastbin
|
e3e4a1985a
|
Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)
To expand with full Organic Maps and Maps.ME commits history run:
git remote add om-historic [om-historic.git repo url]
git fetch --tags om-historic
git replace squashed-history historic-commits
|
2025-05-08 21:10:51 +07:00 |
|