naruse	2014-01-23 02:41:54 +0900 (Thu, 23 Jan 2014)

  New Revision: 44682

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

  Log:
    merge revision(s) 36533:
    
     * tool/ytab.sed: fix for Bison 2.6.

  Modified directories:
    branches/ruby_1_9_2/
  Modified files:
    branches/ruby_1_9_2/tool/ytab.sed
    branches/ruby_1_9_2/version.h
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 44681)
+++ ruby_1_9_2/version.h	(revision 44682)
@@ -1,13 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_2/version.h#L1
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 326
+#define RUBY_PATCHLEVEL 327
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
 
-#define RUBY_RELEASE_YEAR 2013
-#define RUBY_RELEASE_MONTH 12
+#define RUBY_RELEASE_YEAR 2014
+#define RUBY_RELEASE_MONTH 1
 #define RUBY_RELEASE_DAY 23
-#define RUBY_RELEASE_DATE "2013-12-23"
+#define RUBY_RELEASE_DATE "2014-01-23"
 
 #include "ruby/version.h"
 
Index: ruby_1_9_2/tool/ytab.sed
===================================================================
--- ruby_1_9_2/tool/ytab.sed	(revision 44681)
+++ ruby_1_9_2/tool/ytab.sed	(revision 44682)
@@ -5,6 +5,12 @@ i\ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_2/tool/ytab.sed#L5
 a\
 #endif
 }
+/^extern int yydebug;/{
+i\
+#ifndef yydebug
+a\
+#endif
+}
 /^yydestruct.*yymsg/,/#endif/{
   /^yydestruct/{
     /parser/!{

Property changes on: ruby_1_9_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r36533


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