From c2ace60b081c587532ba01ffebd6f4c1fe84e643 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 21 Apr 2008 04:57:00 +0000
Subject: Merge from ruby_1_8.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index c254414d2b..1fc6d18a87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Mon Apr 21 10:17:17 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c: should include <errno.h> to refer errno.
+
+Mon Apr 21 10:02:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* hash.c (recursive_hash): prototype.
+
+Mon Apr 21 10:00:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* time.c (rb_strftime): check errno to detect strftime(3)'s error.
+	  this is workaround for recent version of MSVCRT.
+	  [ruby-dev:34456]
+
 Sun Apr 20 21:02:06 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* enumerator.c: Resolve the method every time an enumeration
-- 
cgit v1.2.3