summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-26 08:23:50 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-26 08:23:50 +0000
commit35f8beefb68e978e21158bbc0c40556cc09690f1 (patch)
treeb0e08ba2aa523a4eb5c555d75188fd38cd9ddf00 /version.h
parent244260d60b526f47583ed9cfdac995d1b080b393 (diff)
merge revision(s) 49750: [Backport #10876]
* ext/win32/Win32API.rb (initialize): accept both a string and an array for the arguments of the imported function. reported by Aaron Stone [ruby-core:68208] [Bug #10876] [Fixes GH-835] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49761 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/version.h b/version.h
index 7695b05e47..85e62a4158 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.1"
-#define RUBY_RELEASE_DATE "2015-02-25"
-#define RUBY_PATCHLEVEL 84
+#define RUBY_RELEASE_DATE "2015-02-26"
+#define RUBY_PATCHLEVEL 85
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 25
+#define RUBY_RELEASE_DAY 26
#include "ruby/version.h"