nagachika	2015-07-01 04:15:53 +0900 (Wed, 01 Jul 2015)

  New Revision: 51075

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=51075

  Log:
    merge revision(s) 50834: [Backport #11221]
    
    * ext/zlib/zlib.c: Fix indentation for rdoc.
      [Bug #11221][ruby-core:69465]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/zlib/zlib.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 51074)
+++ ruby_2_2/ChangeLog	(revision 51075)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Jul  1 04:15:38 2015  SHIBATA Hiroshi  <hsbt@r...>
+
+	* ext/zlib/zlib.c: Fix indentation for rdoc.
+	  [Bug #11221][ruby-core:69465]
+
 Sat Jun 27 22:51:59 2015  Shota Fukumori  <her@s...>
 
 	* ext/objspace/objspace_dump.c(dump_object): Return empty JSON object when
Index: ruby_2_2/ext/zlib/zlib.c
===================================================================
--- ruby_2_2/ext/zlib/zlib.c	(revision 51074)
+++ ruby_2_2/ext/zlib/zlib.c	(revision 51075)
@@ -1852,7 +1852,7 @@ rb_inflate_s_allocate(VALUE klass) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/zlib/zlib.c#L1852
  *   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.
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 51074)
+++ ruby_2_2/version.h	(revision 51075)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r50834


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/