aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars <gc@droescher.eu>2014-03-30 22:32:58 +0200
committerLars <gc@droescher.eu>2014-03-30 22:32:58 +0200
commit6d9f2dbfd20d9759353cc4efbb455686bec71252 (patch)
tree4d63740d7d05e90fa41811e151f8a9e84b14009c
parent780969bf12bc995d015f06f1394db88223e1fcd4 (diff)
downloadcgeo-6d9f2dbfd20d9759353cc4efbb455686bec71252.zip
cgeo-6d9f2dbfd20d9759353cc4efbb455686bec71252.tar.gz
cgeo-6d9f2dbfd20d9759353cc4efbb455686bec71252.tar.bz2
Manual alignment of branches
Don't say a word :(
-rw-r--r--main/res/values/changelog_release.xml2
1 files changed, 1 insertions, 1 deletions
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