Merge branch 'master' into releases

[rocksndiamonds.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index f02adce9946a3ec993adedbc040dd7e6276dc598..b3ae71e4f88d8d2bd5af778a814b326264e720e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,16 +1,3 @@
-2005-11-19
-       * fixed music initialization bug in init.c (thanks to David Binderman)
-       * fixed mouse wheel "button" bug in editor (thanks to Tomi Belan)
-         (this bug must probably be fixed at other places, too)
-
-2005-10-16
-       * fixed buggy '#include "SDL.h"' statements in src/libgame/sdl.h
-         (should be '#include <SDL.h>' instead)
-
-2005-08-20
-       * fixed bug preventing "walkable from no direction" from being ignored
-         (due to compatibility code overwriting this setting after loading)
-
 2005-08-15
        * fixed bug on Mac OS X (use of reserved name "Random") in EM engine