mvglasow
7ed4a6ddd9
Merge commit '07cd1ec4f5' into traffic
...
# Conflicts:
# libs/indexer/ftypes_matcher.hpp
Bug: boost/regex.hpp may not be found
Workaround: remove `if` in CMakeLists.txt:226, leave `include_directories`
2025-11-23 17:04:45 +02:00
map-per
9bfebc2046
Add "Business is vacant"/'disused' option to editor ( #526 )
...
Signed-off-by: map-per <map-per@gmx.de >
Co-authored-by: map-per <map-per@gmx.de >
Co-committed-by: map-per <map-per@gmx.de >
2025-11-14 22:10:02 +01:00
mvglasow
781d973faa
Merge commit '2601ec854a' into traffic
...
# Conflicts:
# iphone/Maps/Model/Settings.swift
# iphone/Maps/UI/Settings/SettingsNavigationView.swift
2025-11-05 23:06:07 +02:00
x7z4w
db1e5131b7
[core] Drop products
...
Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org >
2025-10-13 12:09:17 +00:00
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
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
renderexpert
b23c2ba3e3
[Drape] Remove GLES2-related code
...
Signed-off-by: renderexpert <expert@renderconsulting.co.uk >
2025-08-17 08:30:56 +02:00
Alexander Borsuk
76ffc99abd
New cpp folder structure
...
Signed-off-by: Alexander Borsuk <me@alex.bio >
2025-08-14 20:52:04 +07:00
