summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-30 06:04:32 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-30 06:04:32 +0000
commita2542330283e668c518dc9fc1c044959ed1cdc2a (patch)
treef4e6aefbe71237aabf40245d05112ec4ad5ed17d
parent5d53e5b7db12f7f82fbd7dcd3f9e83b7809cd690 (diff)
merge revision(s) 45488: [Backport #9631]
* ext/readline/extconf.rb: fix typo, `$defs` not `$DEFS`. [ruby-core:61756] [Bug #9578] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/readline/extconf.rb2
-rw-r--r--version.h8
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1efe7e61ac..69add1663c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 30 15:04:25 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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@graysoftinc.com>
* lib/csv.rb: Fixed a broken regular expression that was causing
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index 74e34d4d7c..db7dab439d 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -98,7 +98,7 @@ readline.have_func("clear_history")
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")
diff --git a/version.h b/version.h
index 46ea102ca2..2d762a1f47 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#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"