Victor Shcherb cd2a7a9f40 Merge branch 'master' of github.com:osmandapp/Osmand ... Conflicts: OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java		2020-03-26 11:08:27 +01:00
..
assets	Add parsing poi_categories.json	2020-03-10 19:19:26 +02:00
jni
libs	Refactor favorite points	2020-01-06 18:42:24 +01:00
res	Fix icon color	2020-03-26 10:45:27 +02:00
src	Merge branch 'master' of github.com:osmandapp/Osmand	2020-03-26 11:08:27 +01:00
.gitignore	Fix text layer	2020-01-10 20:07:27 +01:00
AndroidManifest-debug.xml
AndroidManifest-free.xml	terrain ui, update material version, field box	2020-03-05 19:59:00 +02:00
AndroidManifest-freecustom.xml	terrain ui, update material version, field box	2020-03-05 19:59:00 +02:00
AndroidManifest-freedev.xml	terrain ui, update material version, field box	2020-03-05 19:59:00 +02:00
AndroidManifest-freehuawei.xml	terrain ui, update material version, field box	2020-03-05 19:59:00 +02:00
AndroidManifest-huawei.xml	terrain ui, update material version, field box	2020-03-05 19:59:00 +02:00
AndroidManifest.xml	Migration to AndroidX	2020-03-04 16:12:06 +02:00
build.gradle	Update material components library	2020-03-05 19:59:08 +02:00
copy_widget_icons.sh
full-ndk-build.sh
lint.xml
ndebug.sh
ndk-build.sh
no_translate.xml
old-ndk-build.sh