From ac77385a9944a2661c41ace3348d596df96f281a Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 29 Dec 2008 07:19:11 +0000
Subject: merges r21143 from trunk into ruby_1_9_1. * ruby.c (process_options):
 set th->base_block only while   it is needed. [ruby-dev:37634] * ruby.c
 (require_libraries): clear th->base_block before   require libraries.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 98e9d24fe..fa37e631a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Dec 29 03:43:25 2008  Koichi Sasada  <ko1@atdot.net> 
+	* ruby.c (process_options): set th->base_block only while
+	  it is needed.  [ruby-dev:37634] [Bug #939]
+
+	* ruby.c (require_libraries): clear th->base_block before
+	  require libraries.
+
 Sun Dec 28 18:39:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* sprintf.c: not force to override snprintf/vsnprintf.
-- 
cgit