Dima-1 c382b6d92d Merge branch 'master' into fix_plan_route_option ... # Conflicts: # OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java # OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java # OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java		2020-08-17 14:17:26 +03:00
..
libs	Remove kuromoji *.lib and added maven dependency	2019-02-18 18:15:34 +02:00
src	Merge branch 'master' into fix_plan_route_option	2020-08-17 14:17:26 +03: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	Update build.gradle (search tests)	2020-06-17 11:46:33 +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