nagachika	2013-06-09 01:21:55 +0900 (Sun, 09 Jun 2013)

  New Revision: 41187

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=41187

  Log:
    merge revision(s) 41184:
    
    Fix a typo.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/test/ruby/test_hash.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41186)
+++ ruby_2_0_0/version.h	(revision 41187)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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"
 
Index: ruby_2_0_0/test/ruby/test_hash.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_hash.rb	(revision 41186)
+++ ruby_2_0_0/test/ruby/test_hash.rb	(revision 41187)
@@ -958,7 +958,7 @@ class TestHash < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_hash.rb#L958
 
     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

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41184


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/