nazar-kutz 82252ef0c2 Merge branch 'master' into TrackAppearenceUiFixes ... # Conflicts: # OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java # OsmAnd/res/values/strings.xml # OsmAnd/src/net/osmand/plus/track/ColorsCard.java		2021-03-09 12:30:19 +02:00
..
libs	Remove kuromoji *.lib and added maven dependency	2019-02-18 18:15:34 +02:00
src	Merge branch 'master' into TrackAppearenceUiFixes	2021-03-09 12:30:19 +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	Add minor stop 10281	2021-03-04 12:55:32 +02: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