From c7458b51f754ad2cf6f397e319b12e7d1d7b6465 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 7 Jul 2015 04:40:09 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ ext/zlib/zlib.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e040f61c7b..79ce51558d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jul 7 13:39:46 2015 SHIBATA Hiroshi + + * ext/zlib/zlib.c: Fix indentation for rdoc. + [Bug #11221][ruby-core:69465] + Tue Jul 7 13:37:34 2015 SHIBATA Hiroshi * ext/bigdecimal/bigdecimal.gemspec: Fix require paths for released gem. diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 9dbc193f54..e8b2d93bae 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -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. diff --git a/version.h b/version.h index d0e2e606e5..749972259d 100644 --- a/version.h +++ b/version.h @@ -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