From 6d9f2dbfd20d9759353cc4efbb455686bec71252 Mon Sep 17 00:00:00 2001
From: Lars <gc@droescher.eu>
Date: Sun, 30 Mar 2014 22:32:58 +0200
Subject: Manual alignment of branches

Don't say a word :(
---
 main/res/values/changelog_release.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml
index 0bec557..de06d1c 100644
--- a/main/res/values/changelog_release.xml
+++ b/main/res/values/changelog_release.xml
@@ -2,7 +2,7 @@
 <resources>
   <!-- changelog for the release branch -->
   <string name="changelog_release" translatable="false">\n
-    <b>2013.03.30:</b>\n
+    <b>2014.03.30:</b>\n
     <b>New features:</b>\n
     · New languages: Catalan, Lithuanian, Romanian\n
     · Parallel loading from different platforms to speed up live map\n
-- 
cgit v1.1