From 71bb73fd1491578973b63a7a05e0c074f2765a49 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Mon, 23 Apr 2001 16:10:22 +0000 Subject: Re-commit ChangeLog. svn path=/trunk/; revision=9508 --- doc/ChangeLog | 2 -- help/ChangeLog | 2 -- 2 files changed, 4 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 * C/Makefile.am: Fixed to install the stylesheet-images as well. ->>>>>>> 1.26 2000-09-07 Aaron Weber * C/fig/ New files: contact-editor.png, mail-composer.png, diff --git a/help/ChangeLog b/help/ChangeLog index dc34126b4c..e88fca6898 100644 --- a/help/ChangeLog +++ b/help/ChangeLog @@ -283,12 +283,10 @@ * C/preface.sgml: Spelling fixes, etc. -======= 2000-09-19 Federico Mena Quintero * C/Makefile.am: Fixed to install the stylesheet-images as well. ->>>>>>> 1.26 2000-09-07 Aaron Weber * C/fig/ New files: contact-editor.png, mail-composer.png, -- cgit