From bedc4d194afeda0280ab23e356f925a71cb2c581 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 22 May 2007 18:19:07 +0000
Subject: merge -c 12190

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 40a6d6b6e..931c5a1a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
-Wed May 23 02:28:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May 23 03:12:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (LDFLAGS): prepend -L. instead appending it to
 	  XLDFLAGS.  [ruby-core:10933]
 
+	* configure.in (Makefile): remove $U for automake from MISSING.
+	  [ruby-talk:248171]
+
 Wed May 23 02:09:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_yield_0): should not clear state on TAG_NEXT when
-- 
cgit