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

..

agg/agg.xcodeproj

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

base/base.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

bsdiff/bsdiff.xcodeproj

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

coding/coding.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

CoMaps.xcworkspace

Merge commit '05cc660641' into traffic

2025-09-10 21:22:40 +03:00

cppjansson/cppjansson.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

descriptions/descriptions.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

drape/drape.xcodeproj

New cpp folder structure

2025-08-14 20:52:04 +07:00

drape_frontend/drape_frontend.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

editor/editor.xcodeproj

[ios] Fix modulemap path in Xcode

2025-08-18 09:07:05 +02:00

expat

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

fastlane

[ios] Renamed Xcode workspace (and fixed a few little things, that were missed before)

2025-06-20 14:32:15 +02:00

freetype/freetype.xcodeproj

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

ge0/ge0.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

generator/generator.xcodeproj

[ios] Make sure all C files keep using the right whitespace

2025-07-10 17:54:27 +02:00

geometry/geometry.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

gflags/gflags.xcodeproj

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

harfbuzz/harfbuzz.xcodeproj

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

icu/icu.xcodeproj

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

indexer/indexer.xcodeproj

[feature] Removed IndexFactory class.

2025-08-23 08:32:06 +02:00

jansson/jansson.xcodeproj

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

keys/Apple

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

kml/kml.xcodeproj

[kml] Factor out ParseXXXColor functions.

2025-08-18 09:07:05 +02:00

map/map.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

minizip

More rebranding including the team identifier, url scheme, and links on about screen

2025-06-15 18:33:52 +07:00

mwm_diff/mwm_diff.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

open_location_code/open_location_code.xcodeproj

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

opening_hours

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

openlr/openlr.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

osrm/osrm.xcodeproj

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

platform/platform.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

protobuf/protobuf.xcodeproj

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

pugixml/pugixml.xcodeproj

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

routing/routing.xcodeproj

[routing] OSM tag based time and turn penalties

2025-08-17 19:40:00 +02:00

routing_common/routing_common.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

search/search.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

shaders/shaders.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

stb_image/stb_image.xcodeproj

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

storage/storage.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

succinct/succinct.xcodeproj

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

tess2/tess2.xcodeproj

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

tracking/tracking.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

traffic/traffic.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

traffxml/traffxml.xcodeproj

[traffic][ios] Make HttpTraffSource configurable in Preferences

2025-08-06 17:21:12 +02:00

transit/transit.xcodeproj

[xcode] Updated upgrade check version to latest value

2025-08-14 18:22:40 +02:00

vulkan_wrapper/vulkan_wrapper.xcodeproj

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

common-debug.xcconfig

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

common-release.xcconfig

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00

common.xcconfig

C++23

2025-08-18 09:07:05 +02:00

fastlane.sh

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

2025-05-08 21:10:51 +07:00