Dima-1 94b97e0318 Merge branch 'master' into travel_obf_gpx_track ... # Conflicts: # OsmAnd/src/net/osmand/plus/wikivoyage/data/TravelObfHelper.java		2021-01-27 11:22:24 +02:00
..
libs	Remove kuromoji *.lib and added maven dependency	2019-02-18 18:15:34 +02:00
src	Merge branch 'master' into travel_obf_gpx_track	2021-01-27 11:22:24 +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	Upgrade gradle/plugin versions. Publish OsmAnd-java to ivy.	2020-11-30 19:08: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