From 1fa93eec3061fa40d149d15cea34d48c6f088142 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 4 Jan 2009 14:05:28 +0000
Subject: merges r21297 from trunk into ruby_1_9_1. * ext/extmk.rb (extmake):
 does not use both of makefile.rb and   extconf.rb at the same time.

* lib/mkmf.rb (DLLIB): depends on Makefile.  [ruby-core:21096]

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 31bff76d2..09367b17a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Jan  4 11:11:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb (extmake): does not use both of makefile.rb and
+	  extconf.rb at the same time.
+
+	* lib/mkmf.rb (DLLIB): depends on Makefile.  [ruby-core:21096]
+
 Sun Jan  4 03:30:18 2009  Tanaka Akira  <akr@fsij.org>
 
 	* io.c (maygvl_copy_stream_wait_read): renamed to add prefix to
-- 
cgit