kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 49202: [Backport #10668]

Browse source 
* 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
This commit is contained in:
usa 2015-01-22 09:15:53 +00:00
parent 8c519e28b9
commit eec0044de9
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Jan 22 18:15:41 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* 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 <shibata.hiroshi@gmail.com>
* test/ruby/test_io.rb: added timeout for AIX environment.

2
ext/zlib/zlib.c
View file

@ -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

2
version.h
View file

@ -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