summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-05 05:10:41 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-05 05:10:41 +0000
commitcd171e481ffaf1a5ebfe9b3e1c13ec12afbb6216 (patch)
treec04d273c43616cbf4c6b3b296b2eeb95d6f6022c /version.h
parent2e86a92b3c9153bc5bc47e5684ab3ace70d824ae (diff)
merge revision(s) 47153: [Backport #10127]
* ext/win32ole/win32ole.c (ole_create_dcom): use the converted result if the argument can be converted to a string, to get rid of invalid access. Thanks to nobu. [ruby-dev:48467] [Bug #10127] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47405 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 c61d2346b9..bb5209e08f 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-09-05"
-#define RUBY_PATCHLEVEL 554
+#define RUBY_PATCHLEVEL 555
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 9