usa	2014-04-30 15:04:32 +0900 (Wed, 30 Apr 2014)

  New Revision: 45746

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

  Log:
    merge revision(s) 45488: [Backport #9631]
    
    * ext/readline/extconf.rb: fix typo, `$defs` not `$DEFS`.
      [ruby-core:61756] [Bug #9578]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/readline/extconf.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 45745)
+++ ruby_2_0_0/ChangeLog	(revision 45746)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Apr 30 15:04:25 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/readline/extconf.rb: fix typo, `$defs` not `$DEFS`.
+	  [ruby-core:61756] [Bug #9578]
+
 Mon Mar 31 00:57:39 2014  James Edward Gray II  <james@g...>
 
 	* lib/csv.rb: Fixed a broken regular expression that was causing
Index: ruby_2_0_0/ext/readline/extconf.rb
===================================================================
--- ruby_2_0_0/ext/readline/extconf.rb	(revision 45745)
+++ ruby_2_0_0/ext/readline/extconf.rb	(revision 45746)
@@ -98,7 +98,7 @@ readline.have_func("clear_history") https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/readline/extconf.rb#L98
 readline.have_func("rl_redisplay")
 readline.have_func("rl_insert_text")
 unless readline.have_type("rl_hook_func_t")
-  $DEFS << "-Drl_hook_func_t=Function"
+  $defs << "-Drl_hook_func_t=Function"
 end
 
 create_makefile("readline")
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 45745)
+++ ruby_2_0_0/version.h	(revision 45746)
@@ -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 "2014-03-31"
-#define RUBY_PATCHLEVEL 466
+#define RUBY_RELEASE_DATE "2014-04-30"
+#define RUBY_PATCHLEVEL 467
 
 #define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_MONTH 4
+#define RUBY_RELEASE_DAY 30
 
 #include "ruby/version.h"
 

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


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