summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 05:03:20 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 05:03:20 +0000
commitb2248a008f60e77acc2f48fdebf4d1aa870d1e65 (patch)
tree06bf07e5e84573c58ee97dce55cf95421637a6f1 /version.h
parenteee441fdfe9941d13aff0333effd0c6f6ced346f (diff)
merge revision(s) 55797: [Backport #12645]
* ext/socket/option.c, ext/socket/rubysocket.h (inet_ntop): share the fallback definition. [ruby-core:76646] [Bug #12645] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55926 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 4373d62228..ceda3dfb19 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 354
+#define RUBY_PATCHLEVEL 355
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 8