simon 79b542384d conflict resolved		2020-10-09 14:24:15 +03:00
..
assets	Revert "Draft: simple web server added"	2020-09-01 16:35:23 +02:00
jni
libs
res	conflict resolved	2020-10-09 14:24:15 +03:00
src	conflict resolved	2020-10-09 14:24:15 +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	Fix possible crash and migrate file provider name in manifests	2020-03-05 19:30:07 +02:00
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	oauth authtoken saved	2020-09-30 14:34:14 +03:00
build.gradle	conflict resolved	2020-10-08 12:09:32 +03:00
full-ndk-build.sh
lint.xml
ndebug.sh
ndk-build.sh
no_translate.xml
old-ndk-build.sh