aboutsummaryrefslogtreecommitdiffstats
path: root/main/res
diff options
context:
space:
mode:
authorrsudev <rasch@munin-soft.de>2015-03-12 21:39:36 +0100
committerrsudev <rasch@munin-soft.de>2015-03-12 21:39:36 +0100
commit60d60ec338e5b889d0bb9bcd38a71d706a2f0016 (patch)
treeb976424f57463377dfb79aa210a86d1921c0992f /main/res
parente685f1a95cee461b38b4fe3a9d2ed261b552dbce (diff)
parent13a402c9134e1c27376edccfc5bb4830c317fcfb (diff)
downloadcgeo-60d60ec338e5b889d0bb9bcd38a71d706a2f0016.zip
cgeo-60d60ec338e5b889d0bb9bcd38a71d706a2f0016.tar.gz
cgeo-60d60ec338e5b889d0bb9bcd38a71d706a2f0016.tar.bz2
Merge branch 'release'
Diffstat (limited to 'main/res')
-rw-r--r--main/res/values/changelog_release.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml
index a5603d2..df9cee0 100644
--- a/main/res/values/changelog_release.xml
+++ b/main/res/values/changelog_release.xml
@@ -3,7 +3,8 @@
<!-- 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
+ · 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