aboutsummaryrefslogtreecommitdiffstats
path: root/main/res
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2015-03-08 22:34:24 +0100
committerSamuel Tardieu <sam@rfc1149.net>2015-03-08 22:34:24 +0100
commitb451e9a06f3f5ee7f1b6914031413f9c2b0b6432 (patch)
treeca2a477144990780ad5ad2ebe524240f67002649 /main/res
parentb6140ee20f1a74c580208c3f513954a13b7aa572 (diff)
parentf44a56394254731f63eb279073f2949b09966aa1 (diff)
downloadcgeo-b451e9a06f3f5ee7f1b6914031413f9c2b0b6432.zip
cgeo-b451e9a06f3f5ee7f1b6914031413f9c2b0b6432.tar.gz
cgeo-b451e9a06f3f5ee7f1b6914031413f9c2b0b6432.tar.bz2
Merge branch 'issue-4727' into upstream
Diffstat (limited to 'main/res')
-rw-r--r--main/res/values/changelog_release.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml
index 3c3c8fa..a5603d2 100644
--- a/main/res/values/changelog_release.xml
+++ b/main/res/values/changelog_release.xml
@@ -2,6 +2,10 @@
<resources>
<!-- changelog for the release branch -->
<string name="changelog_release" translatable="false">\n
+ <b>Next bugfix release</b>\n
+ · Fix: Smilies in waypoints not shown\n
+ \n
+ \n
<b>2015.02.23</b>\n
· Fix: Home location not parsed correctly\n
· Fix: Crash exporting GPX for lab caches\n