summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-17 14:11:22 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-17 14:11:22 +0000
commit4c2b74cb53a566a5e3d6e0f3a751ceb60eb0549b (patch)
tree630686150b6c232b33815a2bcaba9920f84aecf6 /version.h
parent8e210f995f37222facee57555996c205fb4fe390 (diff)
merge revision(s) r49620: [Backport #10857]
* lib/resolv.rb (Resolv::DNS::Resource#==, #hash): elements returned by Kernel#instance_variables are Symbols now. [ruby-core:68128] [Bug #10857] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49628 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 6240106b43..73351a9db8 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2015-02-15"
-#define RUBY_PATCHLEVEL 293
+#define RUBY_RELEASE_DATE "2015-02-17"
+#define RUBY_PATCHLEVEL 294
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 17
#include "ruby/version.h"