Vitaliy 05b1eadf69 Merge branch 'master' into plugins_settings ... # Conflicts: # OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java		2020-10-22 22:55:44 +03:00
..
assets	Revert "Draft: simple web server added"	2020-09-01 16:35:23 +02:00
jni
libs	Revert "bug fix"	2020-10-15 12:40:16 +03:00
res	fix empty space	2020-10-21 10:34:11 +03:00
src	Merge branch 'master' into plugins_settings	2020-10-22 22:55:44 +03:00
src-google/net/osmand/plus/inapp	refactor OsmandSettings remove Enum	2020-10-07 23:08:57 +03:00
src-huawei/net/osmand/plus/inapp	refactor OsmandSettings remove Enum	2020-10-07 23:08:57 +03:00
.gitignore	Finished huawei inapps	2020-10-03 20:48:55 +03:00
AndroidManifest-debug.xml
AndroidManifest-free.xml
AndroidManifest-freecustom.xml
AndroidManifest-freedev.xml
AndroidManifest-freehuawei.xml	Added meta-data in manifest for hw build	2020-10-06 18:37:35 +03:00
AndroidManifest.xml	Merge branch 'master' into plugins_settings	2020-10-22 22:55:44 +03:00
build.gradle	remove accidental commit	2020-10-18 21:14:44 +02:00
full-ndk-build.sh
lint.xml
ndebug.sh
ndk-build.sh
no_translate.xml
old-ndk-build.sh