summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 11:28:53 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 11:28:53 +0000
commitb9892d1ba347f74fc718f6479887b2370932ba2f (patch)
tree91c2f502a83ea56835061e0b53e5b17cf33089cb /version.h
parentfc5238a491b41053c39e1586708ec6e5f2736da6 (diff)
merge revision(s) 55115: [Backport #12411]
* transcode.c (enc_arg, str_transcode_enc_args, econv_args): remove volatile, and add GC guards in callers. [ruby-core:75664] [Bug #12411] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55934 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 dddc80f259..20d2e67b9a 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 360
+#define RUBY_PATCHLEVEL 361
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 8