summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-11 02:21:43 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-11 02:21:43 +0000
commitccb84f7b04861339be7130b0dccc9de3a52a3436 (patch)
tree6132efdad26047f77c729ddb543e7f34e5ac272c /ChangeLog
parent116843c6f00e3a5dca5437b6b9364d4466fdb542 (diff)
merge revision(s) 34022: [Backport #5753]
* parse.y (parser_magic_comment): should pass the proper value. [ruby-dev:44984][Bug #5753] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5031faac95..efabc80ab4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 11 11:21:25 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (parser_magic_comment): should pass the proper value.
+ [ruby-dev:44984][Bug #5753]
+
Thu Apr 11 11:18:57 2013 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_core.c: [ruby-core:52303]