naruse	2015-03-25 12:33:14 +0900 (Wed, 25 Mar 2015)

  New Revision: 50085

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

  Log:
    merge revision(s) 49017:
    
    Fix typo for LoadError constant

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/tool/rbinstall.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 50084)
+++ ruby_2_2/version.h	(revision 50085)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.2"
-#define RUBY_RELEASE_DATE "2015-03-22"
-#define RUBY_PATCHLEVEL 87
+#define RUBY_RELEASE_DATE "2015-03-25"
+#define RUBY_PATCHLEVEL 88
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 25
 
 #include "ruby/version.h"
 
Index: ruby_2_2/tool/rbinstall.rb
===================================================================
--- ruby_2_2/tool/rbinstall.rb	(revision 50084)
+++ ruby_2_2/tool/rbinstall.rb	(revision 50085)
@@ -711,7 +711,7 @@ end https://github.com/ruby/ruby/blob/trunk/ruby_2_2/tool/rbinstall.rb#L711
 install?(:ext, :comm, :gem) do
   begin
     require "zlib"
-  rescue LoadErroe
+  rescue LoadError
   end
   if defined?(Zlib)
     require 'pathname'

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49017


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