1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index badff6b18..7facfac0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Mar 18 16:24:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (literal_concat_gen): bail out at different encoding.
+
 Tue Mar 18 04:00:27 2008  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* re.c (rb_memsearch_ss): simple shift search.