Vitaliy 3e81b5926e Merge branch 'master' into custom_plugins ... # Conflicts: # OsmAnd/res/values/strings.xml # OsmAnd/src/net/osmand/plus/OsmandPlugin.java # OsmAnd/src/net/osmand/plus/SettingsHelper.java # OsmAnd/src/net/osmand/plus/quickaction/QuickActionRegistry.java # OsmAnd/src/net/osmand/plus/settings/ExportProfileBottomSheet.java		2020-03-23 13:41:47 +02:00
..
libs	Clean libs	2018-06-15 17:27:49 +02:00
src	Merge branch 'master' into custom_plugins	2020-03-23 13:41:47 +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	Completly remove bsh	2019-11-21 21:47:17 +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