1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index de866bdc5..e98760354 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 30 23:11:06 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/ri/ri_driver.rb (and others): ri now merges documentation
+	  if it finds the same class in multiple places.
+
 Mon Aug 30 22:40:30 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/multi-tk.rb: 'restart' method accepts arguments