From 18d92ed1dca2ff7a1f4fd883c4731e0da6f90086 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 13 Jul 2009 06:13:51 +0000
Subject: merges r23999 from trunk into ruby_1_9_1. -- * marshal.c (r_object0):
 replace \u by u when the regexp is   made by Ruby 1.8. [ruby-dev:36750]

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 515317315..19852dd60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
+Thu Jul  9 21:56:59 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* marshal.c (r_object0): replace \u by u when the regexp is
+	  made by Ruby 1.8. [ruby-dev:36750]
+
 Wed Jul  8 16:47:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_s_basename): returns new string instead of
 	  shared string from FilePathStringValue().  [ruby-core:24199]
 
-2009-07-07  Eric Hodel  <drbrain@segment7.net>
+Wed Jul  8 04:28:16 2009  Eric Hodel  <drbrain@segment7.net>
 
 	* ext/.document:  Update with extensions that appear to have
 	  documentation.  [ruby-core:24181]
-- 
cgit