summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-11-02 06:46:51 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-11-02 06:46:51 +0000
commitef7dbdd2257c08b28bc0fca3a3a534ab6d1c0527 (patch)
tree866491dd1444e64eb7ff6a2d5fb58208b49ffca1 /ChangeLog
parent9bc5dc7a9d9040ee2c01246e73e3dc061ea98625 (diff)
* ChangeLog: typo.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b8ea7ca582..041c7ec3b8 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>