shyouhei	2008-07-17 01:39:00 +0900 (Thu, 17 Jul 2008)

  New Revision: 18089

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

  Log:
    merge revision(s) 18031:
    * ext/zlib/zlib.c (rb_gzfile_set_mtime): fix typo.  [ruby-core:17713]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/zlib/zlib.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ext/zlib/zlib.c
===================================================================
--- ruby_1_8_7/ext/zlib/zlib.c	(revision 18088)
+++ ruby_1_8_7/ext/zlib/zlib.c	(revision 18089)
@@ -2491,7 +2491,7 @@
 	rb_raise(cGzError, "header is already written");
     }
 
-    if (FIXNUM_P(time)) {
+    if (FIXNUM_P(mtime)) {
 	gz->mtime = FIX2INT(mtime);
     }
     else {
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 18088)
+++ ruby_1_8_7/ChangeLog	(revision 18089)
@@ -1,3 +1,7 @@
+Thu Jul 17 01:38:31 2008  Yusuke Endoh  <mame@t...>
+
+	* ext/zlib/zlib.c (rb_gzfile_set_mtime): fix typo.  [ruby-core:17713]
+
 Sun Jul 13 00:08:16 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/ipaddr.rb (IPAddr#initialize): get rid of ArgumentError in
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 18088)
+++ ruby_1_8_7/version.h	(revision 18089)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-07-13"
+#define RUBY_RELEASE_DATE "2008-07-17"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080713
-#define RUBY_PATCHLEVEL 58
+#define RUBY_RELEASE_CODE 20080717
+#define RUBY_PATCHLEVEL 59
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 17
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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