Commit graph

3 commits

Author SHA1 Message Date
yugui
c1dc27f7c2 merges r27723 from trunk into ruby_1_9_2.
--
* 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/branches/ruby_1_9_2@27812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-05-16 03:07:52 +00:00
tenderlove
03399d9001 * test/psych/*: switching tests to use relative require.
[ruby-core:29104]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27095 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-03-29 18:25:57 +00:00
tenderlove
b9b923ca94 * ext/psych/*: importing Psych to trunk
* test/psych/*: ditto
* lib/psych/*: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-03-28 21:49:37 +00:00