summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-08 16:21:55 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-08 16:21:55 +0000
commit6340583fa0ca1679b75ee0d207f8d15e1f7facba (patch)
tree237e1bc0e648b8aa264623db09fca55a0833cb8b
parentcc94db60ba2d21d8371a4bb6a00580c4ba99f544 (diff)
merge revision(s) 41184:
Fix a typo. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41187 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ruby/test_hash.rb2
-rw-r--r--version.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb
index 01a0706c3e..e391c5a611 100644
--- a/test/ruby/test_hash.rb
+++ b/test/ruby/test_hash.rb
@@ -958,7 +958,7 @@ class TestHash < Test::Unit::TestCase
o = Object.new
def o.hash; 2 << 100; end
- assert_equal({x=>1}.hash, {x=>1}.hash)
+ assert_equal({o=>1}.hash, {o=>1}.hash)
end
def test_hash_poped
diff --git a/version.h b/version.h
index 1f29941f0a..2a3499c5d0 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-06-05"
-#define RUBY_PATCHLEVEL 208
+#define RUBY_RELEASE_DATE "2013-06-09"
+#define RUBY_PATCHLEVEL 209
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 5
+#define RUBY_RELEASE_DAY 9
#include "ruby/version.h"