summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-26 00:57:14 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-26 00:57:14 +0000
commitc34b551c0348332e6d36cc4685db7b4d7a39ca9d (patch)
tree628b0f638c4ec5b37cffd51537e14144c1a448e6 /ChangeLog
parent58f269d070fb404f7e78ee7153a01462ab87bdb9 (diff)
merge revision(s) 33542,33543: [Backport #6200]
* parse.y (parser_nextc): set encoding for the buffer of ripper. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 661a17aaf1..1a6876bc74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar 26 09:57:12 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * parse.y (parser_nextc): set encoding for the buffer of ripper.
+
Sun Mar 18 13:23:28 2012 NARUSE, Yui <naruse@ruby-lang.org>
* encoding.c (rb_enc_compatible): return ASCII-8BIT even if 2nd string