nagachika	2013-11-29 00:31:59 +0900 (Fri, 29 Nov 2013)

  New Revision: 43904

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

  Log:
    merge revision(s) 43888: [Backport #9169]
    
    * common.mk (Doxyfile): tool/file2lastrev.rb needs running with
      BASERUBY since r43617.  [ruby-dev:47823] [Bug #9169]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/common.mk
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 43903)
+++ ruby_2_0_0/ChangeLog	(revision 43904)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Fri Nov 29 00:31:46 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (Doxyfile): tool/file2lastrev.rb needs running with
+	  BASERUBY since r43617.  [ruby-dev:47823] [Bug #9169]
+
 Fri Nov 22 13:18:28 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* util.c (ruby_strtod): BigMath requires more precision.
Index: ruby_2_0_0/common.mk
===================================================================
--- ruby_2_0_0/common.mk	(revision 43903)
+++ ruby_2_0_0/common.mk	(revision 43904)
@@ -206,7 +206,7 @@ $(CAPIOUT)/.timestamp: Doxyfile $(PREP) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/common.mk#L206
 Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
 	$(ECHO) generating $@
 	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
-	--srcdir="$(srcdir)" --miniruby="$(MINIRUBY)"
+	--srcdir="$(srcdir)" --miniruby="$(BASERUBY)"
 
 program: showflags $(PROGRAM)
 wprogram: showflags $(WPROGRAM)
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 43903)
+++ ruby_2_0_0/version.h	(revision 43904)
@@ -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-11-22"
-#define RUBY_PATCHLEVEL 353
+#define RUBY_RELEASE_DATE "2013-11-29"
+#define RUBY_PATCHLEVEL 354
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 29
 
 #include "ruby/version.h"
 

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


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