From 4293d0c6be8f587ab4e34e876be1497bcd0509df Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 25 Dec 2008 09:54:43 +0000
Subject: merges r20957 from trunk into ruby_1_9_1. * misc/ruby-mode.el: added
 comment to mention newer version   bundled with Emacs 23 or later.  a patch
 from Phil Hagelberg   <phil at hagelb.org> in [ruby-core:20838].

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 6a9e200ea0..64760076d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 24 03:21:21 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* misc/ruby-mode.el: added comment to mention newer version
+	  bundled with Emacs 23 or later.  a patch from Phil Hagelberg
+	  <phil at hagelb.org> in [ruby-core:20838].
+
 Tue Dec 23 23:49:37 2008  Tanaka Akira  <akr@fsij.org>
 
 	* io.c (rb_io_init_copy): call io_seek only if io_tell succeeds.
-- 
cgit v1.2.3