From fb93b2c96aada8460203dd1f6de33c8b2b1a75c9 Mon Sep 17 00:00:00 2001
From: aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 12 Sep 2004 15:21:49 +0000
Subject: * parse.y: ripper merged. * lex.c: ditto. * keywords: ditto.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 726c81634..5a55e1b10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Sep 13 00:20:39 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y: ripper merged.
+
+	* lex.c: ditto.
+
+	* keywords: ditto.
+
 Sun Sep 12 23:53:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* util.c (ruby_strdup): remove unnecessary code. (xmalloc never
-- 
cgit