nagachika	2013-07-14 00:18:40 +0900 (Sun, 14 Jul 2013)

  New Revision: 41958

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

  Log:
    merge revision(s) 41915:
    
    * sprintf.c: Fix typo patch by @hynkle [Fixes GH-357]
      https://github.com/ruby/ruby/pull/357

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

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41957)
+++ ruby_2_0_0/ChangeLog	(revision 41958)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Jul 14 00:18:08 2013  Zachary Scott  <e@z...>
+
+	* sprintf.c: Fix typo patch by @hynkle [Fixes GH-357]
+	  https://github.com/ruby/ruby/pull/357
+
 Sun Jul 14 00:17:07 2013  Zachary Scott  <zachary@z...>
 
 	* man/ri.1: Incorrect use of .Dd macro [Bug #8620] by Tristan Hill
Index: ruby_2_0_0/sprintf.c
===================================================================
--- ruby_2_0_0/sprintf.c	(revision 41957)
+++ ruby_2_0_0/sprintf.c	(revision 41958)
@@ -422,7 +422,7 @@ get_hash(volatile VALUE *hash, int argc, https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/sprintf.c#L422
  *  For more complex formatting, Ruby supports a reference by name.
  *  %<name>s style uses format style, but %{name} style doesn't.
  *
- *  Exapmles:
+ *  Examples:
  *    sprintf("%<foo>d : %<bar>f", { :foo => 1, :bar => 2 })
  *      #=> 1 : 2.000000
  *    sprintf("%{foo}f", { :foo => 1 })
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41957)
+++ ruby_2_0_0/version.h	(revision 41958)
@@ -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-07-14"
-#define RUBY_PATCHLEVEL 269
+#define RUBY_PATCHLEVEL 270
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 7

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


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