nagachika	2013-03-05 00:35:07 +0900 (Tue, 05 Mar 2013)

  New Revision: 39585

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

  Log:
    merge revision(s) 39317 partially:
    
    * ChangeLog: fix a typo.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39584)
+++ ruby_2_0_0/ChangeLog	(revision 39585)
@@ -217,7 +217,7 @@ Wed Feb 20 17:02:12 2013  Koichi Sasada https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L217
 
 Wed Feb 20 08:05:25 2013 Nobuyoshi Nakada  <nobu@r...>
 
-	* compar.c (rb_invcmp): compare by inversed comarison, with preventing
+	* compar.c (rb_invcmp): compare by inversed comparison, with preventing
 	  from infinite recursion.  [ruby-core:52305] [Bug #7870]
 
 	* string.c (rb_str_cmp_m), time.c (time_cmp): get rid of infinite
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39584)
+++ ruby_2_0_0/version.h	(revision 39585)
@@ -1,6 +1,6 @@ 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-03-05"
-#define RUBY_PATCHLEVEL 14
+#define RUBY_PATCHLEVEL 15
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

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


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