aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog2
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index dc34126b4c..e88fca6898 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -283,12 +283,10 @@
* C/preface.sgml: Spelling fixes, etc.
-=======
2000-09-19 Federico Mena Quintero <federico@helixcode.com>
* C/Makefile.am: Fixed to install the stylesheet-images as well.
->>>>>>> 1.26
2000-09-07 Aaron Weber <aaron@helixcode.com>
* C/fig/ New files: contact-editor.png, mail-composer.png,