109d9aa1bb
# Conflicts: # OsmAnd-java/src/main/java/net/osmand/data/MapObject.java |
||
---|---|---|
.. | ||
libs | ||
src | ||
test-results | ||
.gitignore | ||
build.gradle | ||
collect_legacy_libs.sh | ||
collect_libs.sh |
109d9aa1bb
# Conflicts: # OsmAnd-java/src/main/java/net/osmand/data/MapObject.java |
||
---|---|---|
.. | ||
libs | ||
src | ||
test-results | ||
.gitignore | ||
build.gradle | ||
collect_legacy_libs.sh | ||
collect_libs.sh |