summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-19 18:24:46 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-19 18:24:46 +0000
commitd5a2139dfb854cf59192dfd36e16075786b9297e (patch)
tree8edb73e4c01f2468e5db153dfb231e98837493f8 /ChangeLog
parentb60b8361fdf87961e0538522624d692b8e82cc4c (diff)
Merge RDoc from HEAD
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10335 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c3ec4c81c..52a87fcaf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 19 11:21:46 2006 Eric Hodel <drbrain@segment7.net>
+
+ * lib/test/unit/assertions.rb: Merge RDoc from HEAD.
+
Tue Jun 20 01:06:57 2006 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/rss.rb: