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) 50834: [Backport #11221]

Browse source 
* ext/zlib/zlib.c: Fix indentation for rdoc.
	  [Bug #11221][ruby-core:69465]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-06-30 19:15:53 +00:00
parent 1343c89ecb
commit b46a497ac3
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jul 1 04:15:38 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* ext/zlib/zlib.c: Fix indentation for rdoc.
[Bug #11221][ruby-core:69465]
Sat Jun 27 22:51:59 2015 Shota Fukumori <her@sorah.jp>
* ext/objspace/objspace_dump.c(dump_object): Return empty JSON object when

2
ext/zlib/zlib.c
View file

@ -1852,7 +1852,7 @@ rb_inflate_s_allocate(VALUE klass)
* Have inflate use the window size from the zlib header of the compressed
* stream.
*
* (8..15)
* (8..15)::
* Overrides the window size of the inflate header in the compressed stream.
* The window size must be greater than or equal to the window size of the
* compressed stream.

8
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.3"
#define RUBY_RELEASE_DATE "2015-06-27"
#define RUBY_PATCHLEVEL 137
#define RUBY_RELEASE_DATE "2015-07-01"
#define RUBY_PATCHLEVEL 138
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 27
#define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 1
#include "ruby/version.h"