nagachika	2013-06-25 00:11:21 +0900 (Tue, 25 Jun 2013)

  New Revision: 41604

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

  Log:
    merge revision(s) 41590,41591:
    
    * win32/README.win32: grammar typo by @blankenshipz [Fix GH-334]
      https://github.com/ruby/ruby/pull/334

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

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41603)
+++ ruby_2_0_0/ChangeLog	(revision 41604)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Jun 25 00:10:54 2013  Zachary Scott  <zachary@z...>
+
+	* win32/README.win32: grammar typo by @blankenshipz [Fix GH-334]
+	  https://github.com/ruby/ruby/pull/334
+
 Sun Jun 23 00:09:12 2013  Masaya Tarui  <tarui@r...>
 
 	* gc.c: Fixup around GC by MALLOC.
Index: ruby_2_0_0/win32/README.win32
===================================================================
--- ruby_2_0_0/win32/README.win32	(revision 41603)
+++ ruby_2_0_0/win32/README.win32	(revision 41604)
@@ -40,7 +40,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/win32/README.win32#L40
     The default ((|<PLATFORM>|)) is `(({i386-mswin32}))'.
 
 (2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
-    if you want to change the name of the executable files. 
+    if you want to change the name of the executable files.
     And add ((|RUBYW_INSTALL_NAME|)) to change the name of the
     executable without console window if also you want.
 
@@ -60,8 +60,8 @@ to their base names. https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/win32/README.win32#L60
     $(RUBYW_INSTALL_NAME).ico or rubyw.ico --> $(RUBYW_INSTALL_NAME).exe
     the others                             --> $(RUBY_SO_NAME).dll
 
-Although no icons are distributed with the ruby source or in the official 
-site, you can use anything you like. For example, followings are written 
+Although no icons are distributed with the ruby source or in the official
+site, you can use anything you like. For example, followings are written
 in Japanese, but you can download at least.
 
 * ((<URL:http://homepage1.nifty.com/a_nakata/ruby/>)) or
@@ -129,7 +129,7 @@ in Japanese, but you can download at lea https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/win32/README.win32#L129
 
 == Bugs
 
-You can ((*NOT*)) use a path name contains any white space characters as
+You can ((*NOT*)) use a path name that contains any white space characters as
 the ruby source directory, this restriction comes from the behavior of
 (({!INCLUDE})) directives of (({NMAKE})).
 ((- you may call it a bug. -))
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41603)
+++ ruby_2_0_0/version.h	(revision 41604)
@@ -1,10 +1,10 @@ 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-06-23"
-#define RUBY_PATCHLEVEL 238
+#define RUBY_RELEASE_DATE "2013-06-25"
+#define RUBY_PATCHLEVEL 239
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 23
+#define RUBY_RELEASE_DAY 25
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41590-41591


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