From c8af8515567dc40400771905a03e019587412caf Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 22 Feb 2009 09:47:50 +0000
Subject: merges r22081 from trunk into ruby_1_9_1. * cont.c (cont_mark,
 cont_capture, cont_restore_1): use #else instead   of #elif.  a patch from
 NISHIMATSU Takeshi <t_nissie at yahoo.co.jp>   in [ruby-list:45856].

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 77899295e..c2bb94b3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb  6 01:09:13 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* cont.c (cont_mark, cont_capture, cont_restore_1): use #else instead
+	  of #elif.  a patch from NISHIMATSU Takeshi <t_nissie at yahoo.co.jp>
+	  in [ruby-list:45856].
+
 Thu Feb  5 07:39:33 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* ext/readline/readline.c (Init_readline): remove_history(0) may be
-- 
cgit