From 4d261c55e56314bd629db70cece3b378a92c2b76 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Wed, 24 Oct 2001 22:39:28 +0000 Subject: Fixed to only copy the `calendar.ics' and `calendar.ics~' files. * gui/component-factory.c (xfer_folder): Fixed to only copy the `calendar.ics' and `calendar.ics~' files. svn path=/trunk/; revision=14071 --- calendar/ChangeLog | 1 - 1 file changed, 1 deletion(-) (limited to 'calendar/ChangeLog') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index c329229fa6..68f36658d2 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -19,7 +19,6 @@ * gui/e-calendar-table.c (e_calendar_table_init): use U_ for the ECellCombo popdown strings, as it expects UTF-8 strings. ->>>>>>> 1.1185 2001-10-24 JP Rosevear * gui/e-meeting-time-sel.c (e_meeting_time_selector_construct): -- cgit v1.2.3