summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-08 15:35:29 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-08 15:35:29 +0000
commit18474514cf2c3d1fcf0e6993bd94c226fcd149c7 (patch)
treefac255f8ec7aab86f5ddc690bb6206ed43f8ca77 /ChangeLog
parentd3554dba41442ecad7bb8387ad35c72e7f09710b (diff)
merges r24425 from trunk into ruby_1_9_1.
-- * encoding.c (rb_enc_associate_index): cannot set encoding on special constants. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 96135b8cf..d6f69a84f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ Thu Aug 6 16:25:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (enc_capable, rb_enc_get_index): Symbol is encoding
capable.
+ * encoding.c (rb_enc_associate_index): cannot set encoding on
+ special constants.
+
Wed Aug 5 19:11:01 2009 NARUSE, Yui <naruse@ruby-lang.org>
* ruby.c (rb_stdio_set_default_encoding): declared.