From eec0044de952cd2b78b0797e139a08079277c4df Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 22 Jan 2015 09:15:53 +0000 Subject: merge revision(s) 49202: [Backport #10668] * ext/zlib/zlib.c: fix document of method signatures. [Bug #10668][ruby-core:67186][ci skip] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/zlib/zlib.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index deb98e448e..96cba4b4a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jan 22 18:15:41 2015 SHIBATA Hiroshi + + * ext/zlib/zlib.c: fix document of method signatures. + [Bug #10668][ruby-core:67186][ci skip] + Thu Jan 22 18:10:35 2015 SHIBATA Hiroshi * test/ruby/test_io.rb: added timeout for AIX environment. diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 095727bca2..4b7ef3b9fe 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -461,7 +461,7 @@ rb_zlib_adler32_combine(VALUE klass, VALUE adler1, VALUE adler2, VALUE len2) /* * Document-method: Zlib.crc32 * - * call-seq: Zlib.crc32(string, adler) + * call-seq: Zlib.crc32(string, crc) * * Calculates CRC checksum for +string+, and returns updated value of +crc+. If * +string+ is omitted, it returns the CRC initial value. If +crc+ is omitted, it diff --git a/version.h b/version.h index 42b703ce35..31eedded91 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2015-01-22" -#define RUBY_PATCHLEVEL 616 +#define RUBY_PATCHLEVEL 617 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 1 -- cgit v1.2.3