yugui	2010-11-24 18:37:48 +0900 (Wed, 24 Nov 2010)

  New Revision: 29918

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

  Log:
    merges r29313 and r29314 from trunk into ruby_1_9_2.
    --
    bootstraptest/test_method.rb: add a test for [ruby-core:30534].
    --
    * bootstraptest/test_method.rb: fix last commit.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/bootstraptest/test_method.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 29917)
+++ ruby_1_9_2/ChangeLog	(revision 29918)
@@ -1,3 +1,7 @@
+Wed Sep 22 01:55:48 2010  Koichi Sasada  <ko1@a...>
+
+	* bootstraptest/test_method.rb: fix last commit.
+
 Wed Sep 22 01:49:52 2010  Koichi Sasada  <ko1@a...>
 
 	* bootstraptest/test_method.rb: add a test for [ruby-core:30534].
@@ -2,2 +6,6 @@
 
+Wed Sep 22 01:49:52 2010  Koichi Sasada  <ko1@a...>
+
+	* bootstraptest/test_method.rb: add a test for [ruby-core:30534].
+
 Mon Sep 20 23:23:05 2010  Nobuyoshi Nakada  <nobu@r...>
Index: ruby_1_9_2/bootstraptest/test_method.rb
===================================================================
--- ruby_1_9_2/bootstraptest/test_method.rb	(revision 29917)
+++ ruby_1_9_2/bootstraptest/test_method.rb	(revision 29918)
@@ -1176,7 +1176,7 @@
   end
 }
 assert_equal 'ok', %q{
-  p [0][0, &proc{}] += 21
+  [0][0, &proc{}] += 21
   'ok'
 }, '[ruby-core:30534]'
 
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 29917)
+++ ruby_1_9_2/version.h	(revision 29918)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 50
+#define RUBY_PATCHLEVEL 51
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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