diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-20 07:21:52 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-20 07:21:52 +0000 |
commit | 8ed4d5a465e0445057e6d6e5ee0e09e6448356f8 (patch) | |
tree | 7a62e9cab080a5522e8b9633ac50c1c489fec9df /version.h | |
parent | b1ca15e4ee49fb8a583add67757a44bd39769fc3 (diff) |
merge revision(s) 26326:
* ext/zlib/zlib.c: backport r18029 and r21861 from trunk.
* r18029 ext/zlib/zlib.c (rb_deflate_params): flush before
deflateParams. [ruby-core:17675] (by mame)
* r21861 ext/zlib/zlib.c (zstream_run): desperately guard the
variable. [ruby-core:20576] (by usa)
* test/zlib/test_zlib.rb: backport deflate tests from trunk.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2010-05-20" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20100520 -#define RUBY_PATCHLEVEL 257 +#define RUBY_PATCHLEVEL 258 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |