aboutsummaryrefslogtreecommitdiffstats
path: root/help/ChangeLog
diff options
context:
space:
mode:
authorMichael Meeks <mmeeks@src.gnome.org>2000-09-14 07:40:42 +0800
committerMichael Meeks <mmeeks@src.gnome.org>2000-09-14 07:40:42 +0800
commit9964204c9c080650f79863a483a4c42886d55239 (patch)
tree3c0693385a73461319ab94b63fb15cbe80ae88e5 /help/ChangeLog
parent5678a57e33c55ab2622a3fbb823b42e4f80c31cc (diff)
downloadgsoc2013-evolution-9964204c9c080650f79863a483a4c42886d55239.tar.gz
gsoc2013-evolution-9964204c9c080650f79863a483a4c42886d55239.tar.zst
gsoc2013-evolution-9964204c9c080650f79863a483a4c42886d55239.zip
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
Diffstat (limited to 'help/ChangeLog')
-rw-r--r--help/ChangeLog7
1 files changed, 0 insertions, 7 deletions
diff --git a/help/ChangeLog b/help/ChangeLog
index 15f46d074b..3eeeb169f4 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -195,34 +195,27 @@
especially wrt HTML mail.
-<<<<<<< ChangeLog
2000-06-15 Aaron Weber <aaron@helixcode.com>
* 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 <federico@helixcode.com>
* Makefile.am (SUBDIRS): Added the devel directory.
->>>>>>> 1.15
2000-06-28 Peter Williams <peterw@curious-george.helixcode.com>
* C/Makefile.am (SGML_FILES): Don't depend on the newly-removed
devel-*.sgml files.
->>>>>>> 1.13
2000-06-16 Damon Chaplin <damon@helixcode.com>
* 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 <aaron@helixcode.com>
* C/usage-mainwindow.sgml: added sect on menubar, other minor changes.