From dc2d035f67ce73ce0e09314875674465e62c367e Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 15 Jun 2008 14:20:59 +0000
Subject: merge revision(s) 16596: 	* marshal.c (r_object0, Init_marshal):
 Fix the garbled s_call 	  definition; fixes [ruby-dev:34843].

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 1fae50abcd..de005eb485 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 15 23:20:37 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* marshal.c (r_object0, Init_marshal): Fix the garbled s_call
+	  definition; fixes [ruby-dev:34843].
+
 Sun Jun 15 23:19:14 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c (rb_cstr_to_dbl): should clear errno before calling
-- 
cgit v1.2.3