Vitaliy 747293820e Merge branch 'master' into plan_route_exit_wo_saving ... # Conflicts: # OsmAnd/res/values/strings.xml # OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java		2020-08-14 12:31:56 +03:00
..
assets	add js files to non-tts folders	2020-06-26 13:41:15 +03:00
jni
libs
res	Merge branch 'master' into plan_route_exit_wo_saving	2020-08-14 12:31:56 +03:00
src	Merge branch 'master' into plan_route_exit_wo_saving	2020-08-14 12:31:56 +03:00
.gitignore	Clean up icons	2020-04-21 17:22:38 +02:00
AndroidManifest-debug.xml
AndroidManifest-free.xml
AndroidManifest-freecustom.xml
AndroidManifest-freedev.xml
AndroidManifest-freehuawei.xml
AndroidManifest-huawei.xml
AndroidManifest.xml	Fix #9425	2020-07-11 19:13:09 +03:00
build.gradle	Add custom track colors	2020-08-01 13:35:42 +03:00
full-ndk-build.sh
lint.xml
ndebug.sh
ndk-build.sh
no_translate.xml
old-ndk-build.sh