drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-08 21:37:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '05cc660641' into traffic

Browse Source 
# 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
This commit is contained in:
mvglasow
2025-09-10 21:22:40 +03:00
parent 0713e22328 05cc660641
commit 38e98df6cc
4644 changed files with 82377 additions and 85029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
xcode/CoMaps.xcworkspace/contents.xcworkspacedata generated
View File

@@ -11,17 +11,17 @@
location = "container:common.xcconfig">
</FileRef>
<Group
location = "group:../std"
location = "group:../libs/std"
name = "std">
<FileRef
location = "group:../std/target_os.hpp">
location = "group:../libs/std/target_os.hpp">
</FileRef>
<FileRef
location = "group:../std/windows.hpp">
location = "group:../libs/std/windows.hpp">
</FileRef>
</Group>
<Group
location = "container:../pyhelpers"
location = "container:../libs/pyhelpers"
name = "pyhelpers">
<FileRef
location = "group:pair.hpp">
@@ -85,7 +85,7 @@
location = "container:tess2/tess2.xcodeproj">
</FileRef>
<FileRef
location = "group:vulkan_wrapper/vulkan_wrapper.xcodeproj">
location = "container:vulkan_wrapper/vulkan_wrapper.xcodeproj">
</FileRef>
</Group>
<FileRef
@@ -146,7 +146,7 @@
location = "container:search/search.xcodeproj">
</FileRef>
<FileRef
location = "group:shaders/shaders.xcodeproj">
location = "container:shaders/shaders.xcodeproj">
</FileRef>
<FileRef
location = "container:storage/storage.xcodeproj">
@@ -161,7 +161,7 @@
location = "container:traffxml/traffxml.xcodeproj">
</FileRef>
<FileRef
location = "group:transit/transit.xcodeproj">
location = "container:transit/transit.xcodeproj">
</FileRef>
<FileRef
location = "group:../iphone/Chart/Chart.xcodeproj">