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

merge revision(s) 50834: [Backport #11221]

* 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_1@51178 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2015-07-07 04:40:09 +00:00
parent a0cf0fbd84
commit c7458b51f7
3 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Tue Jul 7 13:39:46 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* ext/zlib/zlib.c: Fix indentation for rdoc.
[Bug #11221][ruby-core:69465]
Tue Jul 7 13:37:34 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* ext/bigdecimal/bigdecimal.gemspec: Fix require paths for released gem.

View file

@ -1832,7 +1832,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.

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.7"
#define RUBY_RELEASE_DATE "2015-07-07"
#define RUBY_PATCHLEVEL 378
#define RUBY_PATCHLEVEL 379
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 7