summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 04:56:04 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 04:56:04 +0000
commiteee441fdfe9941d13aff0333effd0c6f6ced346f (patch)
tree3a6db25e7e76358463f3762830d17f2ca1f1c6ea /version.h
parentbe4b713d53381cbaec2a9b3aeef0113eeacc172b (diff)
merge revision(s) 55729: [Backport #12611]
* vm.c (vm_set_main_stack): remove unnecessary check. toplevel binding must be initialized. [Bug #12611] (N1) * win32/win32.c (w32_symlink): fix return type. [Bug #12611] (N3) * string.c (rb_str_split_m): simplify the condition. [Bug #12611](N4) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55925 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 7d4152e7cc..4373d62228 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.6"
#define RUBY_RELEASE_DATE "2016-08-16"
-#define RUBY_PATCHLEVEL 353
+#define RUBY_PATCHLEVEL 354
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 8