From 174b4fb8a43212958c4da9be33950ebd3480e332 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 17 Nov 2009 06:13:03 +0000
Subject: merges r24984 and r24987 from trunk into ruby_1_9_1. -- * lib/mkmf.rb
 (rm_f, rm_rf): FileUtils.rm can take an array.   [ruby-dev:39345] -- *
 test/fileutils/test_fileutils.rb: add a test for [ruby-dev:39345]

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 0f34765f81..afda849b88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Sep 18 07:06:41 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/fileutils/test_fileutils.rb: add a test for [ruby-dev:39345]
+
+Fri Sep 18 06:36:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (rm_f, rm_rf): FileUtils.rm can take an array.
+	  [ruby-dev:39345]
+
 Thu Oct 29 01:22:01 2009  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
 
 	* ext/socket/extconf.rb : Compilation failure on AIX.
-- 
cgit v1.2.3