1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d07fef24c..92de8b5a1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Oct  3 02:59:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (assignable_gen): get rid of macro collision.
+
 Sat Oct  3 02:49:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* array.c (ary_make_shared): should count frozen array itself.