Bastian Greshake Tzovaras f33bfffbe6 resolve conflicts ...

Signed-off-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com>

2025-12-30 17:38:05 +01:00

..

borders

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

categories-strings

resolve conflicts

2025-12-30 17:38:05 +01:00

conf/isolines

[isolines] Upgrade some popular hiking regions to 20m step

2025-07-28 08:41:02 +02:00

countries-strings

resolve conflicts

2025-12-30 17:38:05 +01:00

fonts

[data] Move fonts into a separate folder

2025-05-19 10:52:42 +02:00

search-icons/svg

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

sound-strings

resolve conflicts

2025-12-30 17:38:05 +01:00

styles

[styles] Fix wrong filename for car pooling parking

2025-12-22 12:24:45 +01:00

symbols

[data] Refactor resources folder

2025-08-08 20:47:41 +07:00

symbols-svg

[android] add support for schuko/type-E charge sockets

2025-11-26 19:31:18 +01:00

test_data

[tests] fix expected test result for bookmarks_test.cpp

2025-09-21 19:17:38 +02:00

vulkan_shaders

Regenerate Vulkan shaders

2025-08-17 08:30:56 +02:00

borders_vs_osm.csv

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

categories_brands.txt

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

categories_cuisines.txt

Revert "[types] Add cuisines"

2025-10-25 20:19:57 +02:00

config.xsd

[editor] Update editor.config and config.xsd xml root

2025-05-22 20:06:09 +07:00

copyright.html

[copyright] Add StreetComplete-taginfo-categorize to copyright

2025-11-16 21:20:43 +01:00

countries_meta.txt

[core] Add language data to world files

2025-12-29 16:13:18 +01:00

countries_synonyms.csv

Add Myanmar Burma synonyms

2025-11-12 21:16:34 +07:00

countries.txt

[planet] Update map data to 251227

2025-12-28 23:14:55 +07:00

editor.config

[editor] Add more complex types and support healthcare and education

2025-12-28 16:48:57 +01:00

faq.html

edit link to support

2025-10-27 14:15:41 +08:00

hierarchy.txt

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

icudt75l.dat

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

languages.txt

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

mapcss-dynamic.txt

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

mapcss-mapping.csv

[editor] More types can be marked as vacant

2025-12-30 12:31:08 +01:00

minsk-pass.mwm

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

minsk-pass.osm.bz2

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

mixed_nodes.txt

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

mixed_tags.txt

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

old_vs_new.csv

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

opening_hours_how_to_edit.html

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

packed_polygons.bin

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

replaced_tags.txt

[styles] Add natural=sand (#2451)

2025-11-16 19:19:58 +01:00

skipped_elements.json

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

synonyms.txt

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

taginfo.json

[taginfo] update tags

2025-12-28 17:38:17 -03:00

transit_colors.txt

Organic Maps sources as of 02.04.2025 (fad26bbf22ac3da75e01e62aa01e5c8e11861005)

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

welcome.html

[desktop] Change ID from .desktop to .qt

2025-08-10 10:06:24 +02:00