Victor Shcherb 977c75af8f Merge branch 'master' of github.com:osmandapp/Osmand ... Conflicts: OsmAnd/src/net/osmand/plus/osmedit/EditPoiData.java		2015-11-12 10:35:21 +01:00
..
.settings
ant-lib
assets	Add 4 tests	2015-10-25 16:01:53 +01:00
jni
libs
res	Translated using Weblate (French)	2015-11-12 10:33:26 +01:00
src	Merge branch 'master' of github.com:osmandapp/Osmand	2015-11-12 10:35:21 +01:00
.classpath
.cproject	Rename download-ui package	2015-10-18 22:16:49 +02:00
.gitignore	Ignore new asset folder	2015-10-30 17:18:49 +02:00
.project
AndroidManifest-free.xml
AndroidManifest.xml	Dialogs replaced with AppCompatDialogs	2015-11-11 12:42:13 +02:00
ant.properties
bidforfix.xml
build.gradle	include legend's html file	2015-11-08 09:54:35 +01:00
build.xml	Fix	2015-11-11 19:45:54 +01:00
copy_widget_icons.sh
full-ndk-build.sh
lint.xml
local.properties.sample
ndebug.sh
ndk-build.sh
no_translate.xml	Update release version	2015-11-11 16:53:44 +01:00
old-ndk-build.sh
proguard-project.txt
project.properties