nagachika	2015-03-01 00:59:54 +0900 (Sun, 01 Mar 2015)

  New Revision: 49783

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

  Log:
    merge revision(s) r49202: [Backport #10668]
    
    * ext/zlib/zlib.c: fix document of method signatures.
      [Bug #10668][ruby-core:67186][ci skip]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/zlib/zlib.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 49782)
+++ ruby_2_1/ChangeLog	(revision 49783)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sun Mar  1 00:58:30 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* ext/zlib/zlib.c: fix document of method signatures.
+	  [Bug #10668][ruby-core:67186][ci skip]
+
 Sat Feb 28 02:13:17 2015  Tanaka Akira  <akr@f...>
 
 	* lib/resolv.rb (Resolv::DNS::Name#==): Compare an array of Label:Str
Index: ruby_2_1/ext/zlib/zlib.c
===================================================================
--- ruby_2_1/ext/zlib/zlib.c	(revision 49782)
+++ ruby_2_1/ext/zlib/zlib.c	(revision 49783)
@@ -461,7 +461,7 @@ rb_zlib_adler32_combine(VALUE klass, VAL https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/zlib/zlib.c#L461
 /*
  * 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
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49782)
+++ ruby_2_1/version.h	(revision 49783)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2015-02-28"
-#define RUBY_PATCHLEVEL 300
+#define RUBY_RELEASE_DATE "2015-03-01"
+#define RUBY_PATCHLEVEL 301
 
 #define RUBY_RELEASE_YEAR 2015
-#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_MONTH 3
+#define RUBY_RELEASE_DAY 1
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49202


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