From 8cb514d6dd9497893a35a089d07a132d51263ee7 Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Thu, 10 Aug 2000 17:30:50 +0000 Subject: Merge with camel-async. svn path=/trunk/; revision=4687 --- calendar/ChangeLog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'calendar') 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 OK, it seems that we have all the interesting properties for -- cgit v1.2.3