From 1c5442423d3eeab29560ebcd2fa70560f97296f4 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 4 Aug 2006 22:21:49 +0000
Subject: Merge RDoc and .document from HEAD

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 79d09c551..44a89b477 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Aug  4 15:21:00 2006  Eric Hodel  <drbrain@segment7.net>
+
+	* lib: Merge RDoc and .document from HEAD.
+
 Fri Aug  4 19:13:41 2006 Keiju Ishitsuka <keiju@ruby-lang.org>
 	
 	* lib/irb/{init.rb,ruby-lex.rb,slex.rb}: can't input '\c' for
-- 
cgit