aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-10 16:22:52 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-10 16:22:52 +0000
commit0de068d03e373cbc95da824c4b5a07910ea20e3f (patch)
treee48e5829ca8b32b8dcd860cb70c87a393fbd3e2b /ChangeLog
parent9d3b304b0bc0f2e36b61579971dafd83798ab56b (diff)
downloadruby-0de068d03e373cbc95da824c4b5a07910ea20e3f.tar.gz
* ext/psych/parser.c (parse): Return strings encoded as
Encoding.default_internal if set. * test/psych/test_encoding.rb: Tests for encoding change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27723 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 6a907ce45f..540d4c90ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 11 01:20:43 2010 Aaron Patterson <aaron@tenderlovemaking.com>
+
+ * ext/psych/parser.c (parse): Return strings encoded as
+ Encoding.default_internal if set.
+
Mon May 10 23:50:19 2010 Tanaka Akira <akr@fsij.org>
* pack.c (pack_unpack): add a missing break.