diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-26 04:26:16 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-26 04:26:16 +0000 |
commit | f9a641fdd2d72f7fa7ffe5ad7f2f8e0cf6467af4 (patch) | |
tree | f05adf8035804ac0d9e5841290a88e2dfc0c5464 /version.h | |
parent | a29386aaabd32bc4018cdec2362f8e42d829b105 (diff) |
merge revision(s) 54755: [Backport #12313]
* encoding.c: Fix return value of `Encoding::ISO8859_1.name`
[Bug #12313][ruby-core:75147][ci skip]
* ext/bigdecimal/bigdecimal.c: Fix code sample of `BigDecimal.new`
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.5" #define RUBY_RELEASE_DATE "2016-04-26" -#define RUBY_PATCHLEVEL 317 +#define RUBY_PATCHLEVEL 318 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 4 |