Merge remote-tracking branch 'origin/master'

2015-12-07 00:45:58 +01:00 · 2015-12-07 00:45:58 +01:00 · 66dfc10b32
commit 66dfc10b32
parent 66b23faeb3 d73f34d9d3
5 changed files with 1 additions and 1 deletions
--- a/OsmAnd-java/.classpath
+++ b/OsmAnd-java/.classpath
@ -9,7 +9,7 @@
 	<classpathentry kind="lib" path="libs/junidecode-0.1.jar"/>
 	<classpathentry kind="lib" path="libs/kxml2-2.3.0.jar"/>
 	<classpathentry kind="lib" path="libs/tuprolog.jar"/>
-	<classpathentry kind="lib" path="libs/icu4j-49_1.jar"/>
+	<classpathentry kind="lib" path="libs/icu4j-56_1_patched.jar"/>
 	<classpathentry kind="lib" path="libs/gnu-trove-osmand.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
--- a/OsmAnd-java/libs/icu4j-49_1.jar
+++ b/OsmAnd-java/libs/icu4j-49_1.jar
--- a/OsmAnd-java/libs/icu4j-56_1_patched.jar
+++ b/OsmAnd-java/libs/icu4j-56_1_patched.jar
--- a/OsmAnd/libs/icu4j-49_1.jar
+++ b/OsmAnd/libs/icu4j-49_1.jar
--- a/OsmAnd/libs/icu4j-56_1_patched.jar
+++ b/OsmAnd/libs/icu4j-56_1_patched.jar