From 08c47c5515b3e247f75b6fb129cc5466e5ff3c85 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 29 Jun 2008 09:36:28 +0000
Subject: merge revision(s) 17586,17612: 	* ruby.c (set_arg0,
 ruby_prog_init): freeze $0.  a patch from Keita 	  Yamaguchi
 <keita.yamaguchi at gmail.com>. 	* test/inlinetest.rb
 (InlineTest.in_progname): workaround for frozen 	  $0. 
 [ruby-dev:35261] 	* lib/test/unit/ui/console/testrunner.rb
 (TestRunner#finished): ditto.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 73e95fa910..49480af1ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Sun Jun 29 18:35:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/inlinetest.rb (InlineTest.in_progname): workaround for frozen
+	  $0.  [ruby-dev:35261]
+
+	* lib/test/unit/ui/console/testrunner.rb (TestRunner#finished): ditto.
+
+Sun Jun 29 18:35:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (set_arg0, ruby_prog_init): freeze $0.  a patch from Keita
+	  Yamaguchi <keita.yamaguchi at gmail.com>.
+
 Sun Jun 29 18:32:19 2008  Tanaka Akira  <akr@fsij.org>
 
 	* process.c: include sys/resource.h if HAVE_SYS_RESOURCE_H is defined.
-- 
cgit v1.2.3