Merge branch 'master' into releases

[rocksndiamonds.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 7c0df045a9aab7d623ae4bed7943153989c02937..2469c878cf229ac1e4e1ef9df49af90d5bbb3ed7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2013-11-24
+       * version 3.3.1.2 released
+
+2013-11-20
+       * improved error handling: display error message on screen (not only in
+         the error file or on the console), and display path of the error file
+
+2013-11-13
+       * fixed problem with R'n'D restarting with same level set that may have
+         caused a problem (and therefore failing again and again); after an
+         error, the last level set is now deactivated in file "levelsetup.conf"
+         to restart with default level set (which should work without error)
+
+2013-11-07
+       * fixed determining main game data directory on Mac OS X "Mavericks"
+
+2013-11-04
+       * version number set to 3.3.1.2
+
 2013-11-04
        * version 3.3.1.1 released