Chumva 98f7460d3c Merge branch 'master' of ssh://github.com/osmandapp/Osmand into MeasureDistanceImprovements ... # Conflicts: # OsmAnd/res/values/strings.xml		2018-02-14 12:48:54 +02:00
..
.settings
ant-lib
assets
jni
libs
res	Merge branch 'master' of ssh://github.com/osmandapp/Osmand into MeasureDistanceImprovements	2018-02-14 12:48:54 +02:00
src	Merge branch 'master' of ssh://github.com/osmandapp/Osmand into MeasureDistanceImprovements	2018-02-14 12:48:54 +02:00
.classpath
.cproject
.gitignore	Update gradle to 4 and gradle compile plugin	2017-07-10 01:26:18 +02:00
.project
AndroidManifest-free.xml	Test second splash screen	2017-07-07 19:02:10 +03:00
AndroidManifest-freedev.xml	Test second splash screen	2017-07-07 19:02:10 +03:00
AndroidManifest.xml	Add the ability to import obf files	2018-02-13 19:52:45 +02:00
build.gradle	Update build.gradle	2018-01-24 17:35:10 +01:00
copy_widget_icons.sh
full-ndk-build.sh
google-services.json
lint.xml
local.properties.sample	- moved ftp.user and password to local.properties	2010-12-16 23:07:07 +00:00
ndebug.sh
ndk-build.sh
no_translate.xml	Update no_translate.xml	2018-01-24 17:33:38 +01:00
old-ndk-build.sh
proguard-project.txt
project.properties	Update gradle to 4 and gradle compile plugin	2017-07-10 01:26:18 +02:00