rocksndiamonds-3.1.1

* fixed bug on Mac OS X (use of reserved name "Random") in EM engine

diff --git a/CHANGES b/CHANGES
index d4aeb0434fbd1fb9f8667aebeca6cc27919acbf9..e7218e4287be6be9f24660be4a1ea646378f78e7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-Release Version 3.1.1 [07 AUG 2005]
+Release Version 3.1.1 [16 AUG 2005]
 -----------------------------------
        - added tutorial level set created by Aaron Davidson
        - added editor element descriptions written by Aaron Davidson

diff --git a/ChangeLog b/ChangeLog
index 5143d8c1ce6750c0c51fdb1e84d5542751341d2e..b3ae71e4f88d8d2bd5af778a814b326264e720e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+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

diff --git a/src/Makefile b/src/Makefile
index 4cd0223f346f74ffcf1c2d343fc13504c8065592..973fdeadd74f539c7f5525d0a08a5585da101790 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -125,7 +125,7 @@ CONFIG_GAME_DIR = $(CONFIG_RO_GAME_DIR) $(CONFIG_RW_GAME_DIR)
 
 
 CONFIG = $(CONFIG_GAME_DIR) $(CONFIG_SCORE_ENTRIES) $(JOYSTICK)
-DEBUG = -DDEBUG -g
+# DEBUG = -DDEBUG -g
 # PROFILING = $(PROFILING_FLAGS)
 
 # OPTIONS = $(DEBUG) -Wall                     # only for debugging purposes

diff --git a/src/conftime.h b/src/conftime.h
index d497fb8f02c6096c8ebd95fe697ad4a14b9dc36a..d3021871bce22ecfbfefc29523fc0442d2a19976 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2005-08-15 23:05]"
+#define COMPILE_DATE_STRING "[2005-08-16 00:08]"