From b6ee7159134dba88510355ae54b2a2852b1bf3f0 Mon Sep 17 00:00:00 2001
From: knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 27 Feb 2007 12:51:26 +0000
Subject: Merge changes between r11907 and r11913 from ruby_1_8.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 01f65117d..9c38c0d5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 27 21:50:10 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* util.c (__crt0_glob_function): use ruby_glob() instead of rb_globi().
+
+	* configure.in (ac_cv_func_setrlimit): workaround for djgpp.
+
 Tue Feb 27 20:49:19 2007  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/base64.rb (Base64::b64encode): Fix documentation; submitted
-- 
cgit