diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-07 21:31:43 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-07 21:31:43 +0000 |
| commit | a9649469b5de1ae185bde4c5dbece6f16e89c85d (patch) | |
| tree | fb5b830b4f66880b610fd0bcf547f49df4cc5b9b /ChangeLog | |
| parent | 79086bb454f604cc993f57b270333d409eb8d900 (diff) | |
merge revision(s) 35245,35248:
* ext/psych/lib/psych.rb: bumping up psych version to match release.
* ext/psych/psych.gemspec: ditto
* ext/psych/parser.c: fall back to any encoding if the external
encoding is wrong. [ruby-core:44163]
* test/psych/test_encoding.rb: fix test
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35251 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,14 @@ +Sat Apr 7 10:28:40 2012 Aaron Patterson <aaron@tenderlovemaking.com> + + * ext/psych/lib/psych.rb: bumping up psych version to match release. + * ext/psych/psych.gemspec: ditto + +Sat Apr 7 02:07:00 2012 Aaron Patterson <aaron@tenderlovemaking.com> + + * ext/psych/parser.c: fall back to any encoding if the external + encoding is wrong. [ruby-core:44163] + * test/psych/test_encoding.rb: fix test + Wed Apr 4 18:29:15 2012 NAKAMURA Usaku <usa@ruby-lang.org> * test/ruby/test_sleep.rb (TestSleep#test_sleep_5sec): syntax error. |