From 06ef62ec2a89434a0917b1a6c793b01aba76d57e Mon Sep 17 00:00:00 2001
From: Lars <gc@droescher.eu>
Date: Thu, 12 Mar 2015 22:38:56 +0100
Subject: Update changelog_release.xml

---
 main/res/values/changelog_release.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml
index df9cee0..fb665ef 100644
--- a/main/res/values/changelog_release.xml
+++ b/main/res/values/changelog_release.xml
@@ -3,6 +3,7 @@
   <!-- changelog for the release branch -->
   <string name="changelog_release" translatable="false">\n
     <b>Next bugfix release</b>\n
+    · Fix: Searches not returning coordinates for premium members\n
     · Fix: Images from short description not shown in image gallery\n
     · Fix: Smilies in waypoint descriptions not shown\n	
     \n
-- 
cgit v1.1


From 80a350ebc20c861f630dcfb211a6f6d54800ea34 Mon Sep 17 00:00:00 2001
From: Lars <gc@droescher.eu>
Date: Thu, 12 Mar 2015 22:43:12 +0100
Subject: Version code for release

---
 main/res/values/changelog_release.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml
index fb665ef..bb395bc 100644
--- a/main/res/values/changelog_release.xml
+++ b/main/res/values/changelog_release.xml
@@ -2,13 +2,13 @@
 <resources>
   <!-- changelog for the release branch -->
   <string name="changelog_release" translatable="false">\n
-    <b>Next bugfix release</b>\n
+    <b>2015.03.12:</b>\n
     · Fix: Searches not returning coordinates for premium members\n
     · Fix: Images from short description not shown in image gallery\n
     · Fix: Smilies in waypoint descriptions not shown\n	
     \n
     \n
-    <b>2015.02.23</b>\n
+    <b>2015.02.23:</b>\n
     · Fix: Home location not parsed correctly\n	
     · Fix: Crash exporting GPX for lab caches\n
     · Fix: Crash restoring non-existing database backup\n
-- 
cgit v1.1


From 115ead693d71025fac61d9390fed00fe150b96b1 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Mon, 16 Mar 2015 10:41:46 +0100
Subject: fix #4686: waypoint texts might get mixed up

---
 main/src/cgeo/geocaching/Geocache.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/main/src/cgeo/geocaching/Geocache.java b/main/src/cgeo/geocaching/Geocache.java
index 67af107..ccec153 100644
--- a/main/src/cgeo/geocaching/Geocache.java
+++ b/main/src/cgeo/geocaching/Geocache.java
@@ -1206,7 +1206,9 @@ public class Geocache implements IWaypoint {
         waypoint.setGeocode(geocode);
 
         if (waypoint.getId() < 0) { // this is a new waypoint
-            assignUniquePrefix(waypoint);
+            if (StringUtils.isBlank(waypoint.getPrefix())) {
+                assignUniquePrefix(waypoint);
+            }
             waypoints.add(waypoint);
             if (waypoint.isFinalWithCoords()) {
                 finalDefined = true;
@@ -1241,13 +1243,14 @@ public class Geocache implements IWaypoint {
         }
 
         for (int i = OWN_WP_PREFIX_OFFSET; i < 100; i++) {
-            final String prefixCandidate = StringUtils.leftPad(String.valueOf(i), 2, '0');
+            final String prefixCandidate = String.valueOf(i);
             if (!assignedPrefixes.contains(prefixCandidate)) {
                 waypoint.setPrefix(prefixCandidate);
-                break;
+                return;
             }
         }
 
+        throw new IllegalStateException("too many waypoints, unable to assign unique prefix");
     }
 
     public boolean hasWaypoints() {
-- 
cgit v1.1