summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-01 11:55:03 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-01 11:55:03 +0000
commitab58587f6a3bbd3ca03d0707637712a166441142 (patch)
tree1b2bfbc2f1272dd4b3a7fc0f3ec00d0783855171 /version.h
parentb8b43fbdbea07bfa8e0f2d3ca65871d80b7c903e (diff)
merge revision(s) r45225,r45240,r45488: [Backport #9578] [Backport #9630]
* ext/readline/readline.c (Init_readline): Use rl_hook_func_t instead of Function to support readline-6.3. (rl_hook_func_t is available since readline-4.2.) Reported by Dmitry Medvinsky. [ruby-core:61141] [Bug #9578] * ext/readline/extconf.rb (rl_hook_func_t): define as Function for very old readline versions. [ruby-core:61209] [Bug #9578] * 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_1@45772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/version.h b/version.h
index 746643bda1..93f816fbee 100644
--- a/version.h
+++ b/version.h
@@ -1,9 +1,9 @@
#define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-03-01"
-#define RUBY_PATCHLEVEL 80
+#define RUBY_RELEASE_DATE "2014-05-01"
+#define RUBY_PATCHLEVEL 81
#define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 3
+#define RUBY_RELEASE_MONTH 5
#define RUBY_RELEASE_DAY 1
#include "ruby/version.h"