nagachika	2013-06-09 02:03:42 +0900 (Sun, 09 Jun 2013)

  New Revision: 41191

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

  Log:
    merge revision(s) 40783 (partially): [Backport #8413]
    
    * win32/Makefile.sub (config.status): fix typo.

  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/Makefile.sub

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 41190)
+++ ruby_2_0_0/ChangeLog	(revision 41191)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sun Jun  9 01:59:39 2013  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+merge revision 40783 (partially): [Backport #8413]
+
+	* win32/Makefile.sub: fix a typo in config.h.
+
 Sun Jun  9 01:38:55 2013  Charlie Somerville  <charliesome@r...>
 
 	* intern.h: remove dangling rb_class_init_copy declaration
Index: ruby_2_0_0/win32/Makefile.sub
===================================================================
--- ruby_2_0_0/win32/Makefile.sub	(revision 41190)
+++ ruby_2_0_0/win32/Makefile.sub	(revision 41191)
@@ -855,7 +855,7 @@ s,@sitedir@,$${rubylibprefix}/site_ruby, https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/win32/Makefile.sub#L855
 s,@sitearchdir@,$${sitelibdir}/$${sitearch},;t t
 s,@sitelibdir@,$${sitedir}/$${ruby_version},;t t
 s,@vendordir@,$${rubylibprefix}/vendor_ruby,;t t
-s,@vendorarchdir@,$${vendirlibdir}/$${sitearch},;t t
+s,@vendorarchdir@,$${vendorlibdir}/$${sitearch},;t t
 s,@vendorlibdir@,$${vendordir}/$${ruby_version},;t t
 s,@rubyhdrdir@,$$(includedir)/$${RUBY_BASE_NAME}-$$(ruby_version),;t t
 s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41190)
+++ ruby_2_0_0/version.h	(revision 41191)
@@ -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-06-09"
-#define RUBY_PATCHLEVEL 211
+#define RUBY_PATCHLEVEL 212
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6

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


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