From 71f9f511ef6e30a0e18c4c8e0040ed7d60b68de9 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 17 Dec 2008 06:17:51 +0000
Subject: merges r20781 from trunk into ruby_1_9_1. * parse.y (primary): also
 in ripper, saves in_def before restoring.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 1494b6431..038f7ece5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 16 16:29:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (primary): also in ripper, saves in_def before restoring.
+
 Tue Dec 16 12:30:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (ac_cv_header_ucontext_h): do not use ucontext.h on Mac
-- 
cgit