nagachika	2013-04-25 00:40:25 +0900 (Thu, 25 Apr 2013)

  New Revision: 40446

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

  Log:
    merge revision(s) 40435:
    
    Typo by @windwiny [Fixes GH-295]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ext/tk/sample/demos-en/text.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ext/tk/sample/demos-en/text.rb
===================================================================
--- ruby_2_0_0/ext/tk/sample/demos-en/text.rb	(revision 40445)
+++ ruby_2_0_0/ext/tk/sample/demos-en/text.rb	(revision 40446)
@@ -117,7 +117,7 @@ insertion cursor. #{ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/tk/sample/demos-en/text.rb#L117
       end
 }
 
-7. Resize the window.  This widget has been configured with the "setGrid"
+8. Resize the window.  This widget has been configured with the "setGrid"
 option on, so that if you resize the window it will always resize to an
 even number of characters high and wide.  Also, if you make the window
 narrow you can see that long lines automatically wrap around onto
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40445)
+++ ruby_2_0_0/version.h	(revision 40446)
@@ -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-04-25"
-#define RUBY_PATCHLEVEL 165
+#define RUBY_PATCHLEVEL 166
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

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


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