summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-12 15:41:32 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-12 15:41:32 +0000
commit54dc1cf1eda9afac1c43fd21cd077ac216f75730 (patch)
tree1634b813a4a0c4043d7701b1d0ee749d646416e6 /version.h
parent91ad9122a51d795b1267191ec0e40a3e910dbe11 (diff)
merge revision(s) 49867: [Backport #10847] [Backport #10970]
* vm_eval.c (vm_call_super): search next super class from the original class, to get rid of infinite recursion with prepending. a patch by Seiei Higa <hanachin AT gmail.com> at [ruby-core:68434]. [ruby-core:68093] [Bug #10847] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.h b/version.h
index 9447953522..594a109266 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.2"
#define RUBY_RELEASE_DATE "2015-04-13"
-#define RUBY_PATCHLEVEL 90
+#define RUBY_PATCHLEVEL 91
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 4