aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-12-16 10:51:46 +0100
committerSamuel Tardieu <sam@rfc1149.net>2014-12-16 10:51:46 +0100
commit787a485188bdcdd333a71ad1c1d6c3cfe15595b6 (patch)
tree147c2858d930532d173e0cf7f1f262a55803cb7a
parentb5005eec216add0d0a7967194b945447695dae6e (diff)
parentf08614446299a51e08070145c49383d23d4d61e8 (diff)
downloadcgeo-787a485188bdcdd333a71ad1c1d6c3cfe15595b6.zip
cgeo-787a485188bdcdd333a71ad1c1d6c3cfe15595b6.tar.gz
cgeo-787a485188bdcdd333a71ad1c1d6c3cfe15595b6.tar.bz2
Merge branch 'release' into upstream
-rw-r--r--main/res/values/changelog_release.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml
index 86361b0..d038acd 100644
--- a/main/res/values/changelog_release.xml
+++ b/main/res/values/changelog_release.xml
@@ -2,6 +2,9 @@
<resources>
<!-- changelog for the release branch -->
<string name="changelog_release" translatable="false">\n
+ <b>Next bugfix release:</b>\n
+ · Fix: Crash due to an overload of sensor data\n
+ \n
<b>2014.12.12:</b>\n
· Fix: Crashes on map popup interaction\n
\n