summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-08 06:31:05 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-08 06:31:05 +0000
commit2a83260a3932f584b5cd3fccd879e562ab4c6737 (patch)
treeb579acdf051941822f983490771c0c0348fd9662
parent30340160a4b0b003dc27e2e347e0892405ed1a48 (diff)
fixed previous commit mistake.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/psych/test_encoding.rb5
-rw-r--r--version.h2
2 files changed, 1 insertions, 6 deletions
diff --git a/test/psych/test_encoding.rb b/test/psych/test_encoding.rb
index f48f5c9032..1abee0df16 100644
--- a/test/psych/test_encoding.rb
+++ b/test/psych/test_encoding.rb
@@ -31,11 +31,6 @@ module Psych
@emitter = Psych::Emitter.new @buffer
end
- def test_dump_load_encoding_object
- assert_cycle Encoding::US_ASCII
- assert_cycle Encoding::UTF_8
- end
-
def test_transcode_shiftjis
str = "こんにちは!"
loaded = Psych.load("--- こんにちは!".encode('SHIFT_JIS'))
diff --git a/version.h b/version.h
index 94e2550813..af9559a02c 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-05-08"
-#define RUBY_PATCHLEVEL 480
+#define RUBY_PATCHLEVEL 481
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 5