From 9964204c9c080650f79863a483a4c42886d55239 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 13 Sep 2000 23:40:42 +0000 Subject: The Commit from hell that breaks all UI related stuff; Anything UI related that breaks is now my fault; apologies in advance. svn path=/trunk/; revision=5415 --- doc/ChangeLog | 7 ------- 1 file changed, 7 deletions(-) (limited to 'doc') diff --git a/doc/ChangeLog b/doc/ChangeLog index 15f46d074b..3eeeb169f4 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -195,34 +195,27 @@ especially wrt HTML mail. -<<<<<<< ChangeLog 2000-06-15 Aaron Weber * C/usage-contact.sgml: Category stuff improved. * C/usage-calendar.sgml: Now covers how to add an event properly. -======= -======= -======= 2000-07-17 Federico Mena Quintero * Makefile.am (SUBDIRS): Added the devel directory. ->>>>>>> 1.15 2000-06-28 Peter Williams * C/Makefile.am (SGML_FILES): Don't depend on the newly-removed devel-*.sgml files. ->>>>>>> 1.13 2000-06-16 Damon Chaplin * C/.cvsignore: added evolution-guide and evolution-guide.junk so we don't get the '? doc/C/evolution-guide' messages each time we do a cvs update. ->>>>>>> 1.12 2000-06-14 Aaron Weber * C/usage-mainwindow.sgml: added sect on menubar, other minor changes. -- cgit v1.2.3