Alexander Sytnyk 4e134d0292 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into menu_behavior ... # Conflicts: # OsmAnd/res/values-large/sizes.xml # OsmAnd/res/values/colors.xml # OsmAnd/res/values/sizes.xml		2018-01-11 15:36:32 +02:00
..
.settings
ant-lib
assets
jni
libs	Added mvt parser lib. Added mapillary vector tiles. Refactored resources cache.	2017-05-16 21:50:41 +03:00
res	Merge branch 'master' of ssh://github.com/osmandapp/Osmand into menu_behavior	2018-01-11 15:36:32 +02:00
src	Merge branch 'master' of ssh://github.com/osmandapp/Osmand into menu_behavior	2018-01-11 15:36:32 +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 custom tabs for displaying wikipedia article	2017-12-27 15:25:29 +02:00
build.gradle	Add custom tabs for displaying wikipedia article	2017-12-27 15:25:29 +02:00
copy_widget_icons.sh
full-ndk-build.sh
google-services.json
lint.xml
local.properties.sample
ndebug.sh
ndk-build.sh
no_translate.xml	Rename OSM Live.	2017-10-13 17:59:41 +03: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