53219e506e
Conflicts: OsmAnd/res/values/strings.xml |
||
---|---|---|
.. | ||
.settings | ||
libs | ||
protobuf-src | ||
src | ||
.classpath | ||
.gitignore | ||
.project | ||
build.gradle | ||
build.xml | ||
collect_legacy_libs.sh | ||
collect_libs.sh |
53219e506e
Conflicts: OsmAnd/res/values/strings.xml |
||
---|---|---|
.. | ||
.settings | ||
libs | ||
protobuf-src | ||
src | ||
.classpath | ||
.gitignore | ||
.project | ||
build.gradle | ||
build.xml | ||
collect_legacy_libs.sh | ||
collect_libs.sh |