summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b8ea7ca58..041c7ec3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
Thu Nov 2 15:43:39 2006 NAKAMURA Usaku <usa@ruby-lang.org>
- * parse.y (primary): should set NODE when compstmt is NULL.
- marge from trunk. fixed: [ruby-dev:29732]
+ * parse.y (primary): should set NODE even when compstmt is NULL.
+ merge from trunk. fixed: [ruby-dev:29732]
Thu Nov 2 14:48:30 2006 Akinori MUSHA <knu@iDaemons.org>