Dima-1 aa1ab94612 Merge branch 'master' into imp_exp_voice ... # Conflicts: # OsmAnd/src/net/osmand/plus/settings/backend/ExportSettingsType.java # OsmAnd/src/net/osmand/plus/settings/backend/backup/SettingsHelper.java # OsmAnd/src/net/osmand/plus/settings/fragments/ExportImportSettingsAdapter.java # OsmAnd/src/net/osmand/plus/settings/fragments/ImportDuplicatesFragment.java		2020-10-31 17:22:13 +02:00
..
libs	Remove kuromoji *.lib and added maven dependency	2019-02-18 18:15:34 +02:00
src	Merge branch 'master' into imp_exp_voice	2020-10-31 17:22:13 +02:00
test-results	Merge remote-tracking branch 'weblate/master'	2018-06-18 22:57:06 +03:00
.gitignore	Rename packages	2018-06-15 15:24:05 +02:00
build.gradle	cleanup	2020-10-06 10:30:10 +03:00
collect_legacy_libs.sh	Fix compilation	2018-07-23 22:26:40 +02:00
collect_libs.sh	keep up-to-date	2013-08-18 21:55:32 +03:00
OsmAnd-core-android.jar	Merge remote-tracking branch 'weblate/master'	2018-06-18 22:57:06 +03:00
OsmAnd-core.jar	Merge remote-tracking branch 'weblate/master'	2018-06-18 22:57:06 +03:00