Merge branch 'master' into releases

[rocksndiamonds.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 5fb78a8ee80d78e113e368cad53298ee69fb88e1..b3ae71e4f88d8d2bd5af778a814b326264e720e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-15
+       * fixed bug on Mac OS X (use of reserved name "Random") in EM engine
+
+2005-08-07
+       * version number temporarily set to 3.1.1 (intermediate bugfix release)
+       * version 3.1.1 released
+
 2005-08-07
        * changed some va_arg() arguments from 'long' to 'int', fixing problems
          on 64-bit architecture systems with LP64 data model