From 0b01f35f65d74bc0569d8f411c91b795fc3c7350 Mon Sep 17 00:00:00 2001
From: ksaito <ksaito@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 4 Nov 2004 14:57:11 +0000
Subject: * regexec.c, regparse.c, regint.h: fixed conflicts between vendor
 branch.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index d8cacbab8..24cb39e31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov  4 23:54:21 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
+
+	* regexec.c, regparse.c, regint.h: fixed conflicts between
+	vendor branch.
+
 Thu Nov  4 23:41:55 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
 
 	* ascii.c, euc_jp.c, oniggnu.h, oniguruma.h, regcomp.c,
-- 
cgit