From 0929f33fed68f515cc35d35355917baa1999c390 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 18 Nov 2008 16:48:24 +0000
Subject: merges r20243 from trunk into ruby_1_9_1. * re.c (rb_reg_desc): re
 might be NULL.

* regerror.c (onig_error_code_to_format): message updated.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index f04c44d84..fc7da7ced 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 18 15:50:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* re.c (rb_reg_desc): re might be NULL.
+
+	* regerror.c (onig_error_code_to_format): message updated.
+
 Tue Nov 18 09:42:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser::make_switch): makes default
-- 
cgit