Dima-1 f69e549e82 Merge branch 'master' into plan_route_save_as_new_track ... # Conflicts: # OsmAnd/res/values/strings.xml # OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java		2020-08-27 11:49:13 +03:00
..
assets	favorite info added	2020-08-24 14:10:03 +03:00
jni
libs
res	Merge branch 'master' into plan_route_save_as_new_track	2020-08-27 11:49:13 +03:00
src	Merge branch 'master' into plan_route_save_as_new_track	2020-08-27 11:49:13 +03:00
.gitignore
AndroidManifest-debug.xml
AndroidManifest-free.xml
AndroidManifest-freecustom.xml
AndroidManifest-freedev.xml	Fix possible crash and migrate file provider name in manifests	2020-03-05 19:30:07 +02:00
AndroidManifest-freehuawei.xml
AndroidManifest-huawei.xml
AndroidManifest.xml	move to nanohttpd	2020-08-20 11:37:26 +03:00
build.gradle	unused import removed	2020-08-20 12:58:01 +03:00
full-ndk-build.sh
lint.xml
ndebug.sh
ndk-build.sh
no_translate.xml
old-ndk-build.sh