From 571e78d2080c63f31f6325120497c2d1dc4b7450 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 17 Nov 2009 07:05:30 +0000
Subject: * regparse.c (parse_char_class): fixes a wrong merge r25531.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 989d1b0eb..8111683ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 17 16:04:13 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* regparse.c (parse_char_class): fixes a wrong merge r25531.
+
 Tue Nov 17 16:01:02 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* insns.def (opt_case_dispatch): need cast.
-- 
cgit