From 012e50dd87bf27dc7d9a6f42ded0ca91fa68ab16 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 15 Jun 2008 14:16:05 +0000
Subject: merge revision(s) 16564: 	* marshal.c (reentrant_check): check
 reentrance via callcc. 	  [ruby-dev:34802]

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 61a07d9f05..524cfd72c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@ Sun Jun 15 23:12:02 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* parse.y (top_local_setup): fixed memory leak bug based on a
 	  patch from Roger Pack <rogerpack2005 at gmail.com> in
 	  [ruby-core:16610].
+Sun Jun 15 23:15:35 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (reentrant_check): check reentrance via callcc.
+	  [ruby-dev:34802]
+
 
 Sun Jun 15 23:08:29 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-- 
cgit v1.2.3