Merge changelogs

2 files changed, 23 insertions, 25 deletions

diff --git a/main/res/values/changelog_master.xml b/main/res/values/changelog_master.xml
index bb711cc..1e3c3d4 100644
--- a/main/res/values/changelog_master.xml
+++ b/main/res/values/changelog_master.xml
@@ -2,30 +2,5 @@
 <resources>
   <!-- changelog for the master branch -->
   <string name="changelog_master" translatable="false">
-    <b>Next feature release:</b>\n
-    · New: Cache icons in lists now shown with same indicators as on the map\n
-    · New: Progress indication while posting a log\n
-    · New: Menu in cache details to put cache on ignore list (but not to remove)\n
-    · New: Upload personal note to Opencaching platforms\n
-    · New: Function to check your login for gcvote.com\n
-    · New: Improved feedback to user and more options when a log can not be posted\n
-    · New: Import Garmin GGZ files\n
-    · New: Almost full support of TerraCaching GPX files\n
-    · New: Filter for never found caches\n
-    · New: Maps.me shows waypoints of cache\n
-    · New: Auto complete geocode in Geokrety logging view\n
-    · New: Add Google Maps transit mode\n
-    · Fix: Last log type for TB logs now remembered correctly\n
-    · Fix: Don\´t accidentally bother geocaching.com for GK trackables\n
-    · Fix: GPX files no longer violate XSD\n
-    · Fix: Detect wrong cache IDs in GPX import to avoid posting logs for wrong caches\n
-    · Fix: Adjustments in size and resizing of coordinate input fields\n
-    · Fix: Maximum terrain stars displayed correctly for extremcaching.com\n
-    · Fix: Visual indication for long press function behind \"Stored\" and \"Filter\" icons in main menu\n
-    · Fix: Contents of cache lists might get inconsistent if active list is changed\n
-    · Fix: Close keyboard when starting search\n
-    · Fix: Close search field when returning from search\n
-    · Fix: Remove duplicate filter for offline logs\n
-    \n
   </string>
 </resources>
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml
index 268631a..63e4093 100644
--- a/main/res/values/changelog_release.xml
+++ b/main/res/values/changelog_release.xml
@@ -3,7 +3,30 @@
   <!-- changelog for the release branch -->
   <string name="changelog_release" translatable="false">\n
     <b>Next release:</b>\n
+    · New: Cache icons in lists now shown with same indicators as on the map\n
+    · New: Progress indication while posting a log\n
+    · New: Menu in cache details to put cache on ignore list (but not to remove)\n
+    · New: Upload personal note to Opencaching platforms\n
+    · New: Function to check your login for gcvote.com\n
+    · New: Improved feedback to user and more options when a log can not be posted\n
+    · New: Import Garmin GGZ files\n
+    · New: Almost full support of TerraCaching GPX files\n
+    · New: Filter for never found caches\n
+    · New: Maps.me shows waypoints of cache\n
+    · New: Auto complete geocode in Geokrety logging view\n
+    · New: Add Google Maps transit mode\n
     · Fix: opencaching.com officially shut down\n
+    · Fix: Last log type for TB logs now remembered correctly\n
+    · Fix: Don\´t accidentally bother geocaching.com for GK trackables\n
+    · Fix: GPX files no longer violate XSD\n
+    · Fix: Detect wrong cache IDs in GPX import to avoid posting logs for wrong caches\n
+    · Fix: Adjustments in size and resizing of coordinate input fields\n
+    · Fix: Maximum terrain stars displayed correctly for extremcaching.com\n
+    · Fix: Visual indication for long press function behind \"Stored\" and \"Filter\" icons in main menu\n
+    · Fix: Contents of cache lists might get inconsistent if active list is changed\n
+    · Fix: Close keyboard when starting search\n
+    · Fix: Close search field when returning from search\n
+    · Fix: Remove duplicate filter for offline logs\n
     \n
     \n
     <b>2015.08.03:</b>\n