Merge branch 'master' into releases

[rocksndiamonds.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 65c1b09381da371ed68d8779c45bc76bec63e7cf..2469c878cf229ac1e4e1ef9df49af90d5bbb3ed7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+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