From 0ff424bc3ca851ad4bbb71b7e552d24db60221f6 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 22 May 2007 14:41:37 +0000
Subject: merge -c 12126

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index cbdb5fad0..372e3e286 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue May 22 23:27:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (ruby_cleanup): exit by SystemExit and SignalException in END
+	  block.  [ruby-core:10609]
+
+	* test/ruby/test_beginendblock.rb (test_should_propagate_exit_code):
+	  test for exit in END block.  [ruby-core:10760]
+
+	* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
+	  test for signal in END block.
+
 Tue May 22 23:14:19 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_provided): check for extension library if SOEXT is
-- 
cgit