summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-04 22:21:49 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-04 22:21:49 +0000
commit38c48b98376ad01915bd30dfcef68b39739f1fec (patch)
tree6230a1f93a72bb528c81f8665f86b5b5748b55a1
parentf9d3987ed1128580157be270e27ee450ecb385aa (diff)
Merge RDoc and .document from HEAD
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10681 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 79d09c5514..44a89b4775 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