diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-25 03:33:14 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-25 03:33:14 +0000 |
commit | db8c0b0ef016e2b2df2c08c0afb67700beb5fff1 (patch) | |
tree | 78ca837148d91db8dda47da224c68ee590fa64b0 | |
parent | b8f4796ac51d057712138e39bd2209e7b613e1d7 (diff) |
merge revision(s) 49017:
Fix typo for LoadError constant
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50085 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rwxr-xr-x | tool/rbinstall.rb | 2 | ||||
-rw-r--r-- | version.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 4a6bae0ce9..db36a2159c 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -711,7 +711,7 @@ end install?(:ext, :comm, :gem) do begin require "zlib" - rescue LoadErroe + rescue LoadError end if defined?(Zlib) require 'pathname' @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.2" -#define RUBY_RELEASE_DATE "2015-03-22" -#define RUBY_PATCHLEVEL 87 +#define RUBY_RELEASE_DATE "2015-03-25" +#define RUBY_PATCHLEVEL 88 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_DAY 25 #include "ruby/version.h" |