diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 3 |
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 |