aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-04-24 00:10:22 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-04-24 00:10:22 +0800
commit71bb73fd1491578973b63a7a05e0c074f2765a49 (patch)
tree2525e5aa3df0fa2b086ad63ea8a99a04b47a52dd /doc
parentc8ace927b9b707522b663a086b3dc14eab69ad1f (diff)
downloadgsoc2013-evolution-71bb73fd1491578973b63a7a05e0c074f2765a49.tar
gsoc2013-evolution-71bb73fd1491578973b63a7a05e0c074f2765a49.tar.gz
gsoc2013-evolution-71bb73fd1491578973b63a7a05e0c074f2765a49.tar.bz2
gsoc2013-evolution-71bb73fd1491578973b63a7a05e0c074f2765a49.tar.lz
gsoc2013-evolution-71bb73fd1491578973b63a7a05e0c074f2765a49.tar.xz
gsoc2013-evolution-71bb73fd1491578973b63a7a05e0c074f2765a49.tar.zst
gsoc2013-evolution-71bb73fd1491578973b63a7a05e0c074f2765a49.zip
Re-commit ChangeLog.
svn path=/trunk/; revision=9508
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,