aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/ChangeLog
diff options
context:
space:
mode:
authorPeter Williams <peterw@src.gnome.org>2000-08-11 01:30:50 +0800
committerPeter Williams <peterw@src.gnome.org>2000-08-11 01:30:50 +0800
commit8cb514d6dd9497893a35a089d07a132d51263ee7 (patch)
tree9f4e5d1f929da7e0be900919753d419fe4c9c61a /calendar/ChangeLog
parentbcbb63c59f80eb4e684036c5ef58ab141fb01b03 (diff)
downloadgsoc2013-evolution-8cb514d6dd9497893a35a089d07a132d51263ee7.tar
gsoc2013-evolution-8cb514d6dd9497893a35a089d07a132d51263ee7.tar.gz
gsoc2013-evolution-8cb514d6dd9497893a35a089d07a132d51263ee7.tar.bz2
gsoc2013-evolution-8cb514d6dd9497893a35a089d07a132d51263ee7.tar.lz
gsoc2013-evolution-8cb514d6dd9497893a35a089d07a132d51263ee7.tar.xz
gsoc2013-evolution-8cb514d6dd9497893a35a089d07a132d51263ee7.tar.zst
gsoc2013-evolution-8cb514d6dd9497893a35a089d07a132d51263ee7.zip
Merge with camel-async.
svn path=/trunk/; revision=4687
Diffstat (limited to 'calendar/ChangeLog')
-rw-r--r--calendar/ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 51cb7a39ab..f09ff0bab0 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -173,6 +173,9 @@
* gui/calendar-model.c: compile fix for Solaris
(works under Linux, too; don't know about others)
+ * this is a test of whether CVS merge does what I
+ think it will do.
+
2000-07-26 Federico Mena Quintero <federico@helixcode.com>
OK, it seems that we have all the interesting properties for