diff options
author | Ettore Perazzoli <ettore@src.gnome.org> | 2001-10-25 06:39:28 +0800 |
---|---|---|
committer | Ettore Perazzoli <ettore@src.gnome.org> | 2001-10-25 06:39:28 +0800 |
commit | 4d261c55e56314bd629db70cece3b378a92c2b76 (patch) | |
tree | 1c662db141e28556f26ab5e2e5f8223ef46bf35f /calendar/ChangeLog | |
parent | 0ac0b8d0e85ece7e006a4888d28d54bf1df34b0e (diff) | |
download | gsoc2013-evolution-4d261c55e56314bd629db70cece3b378a92c2b76.tar.gz gsoc2013-evolution-4d261c55e56314bd629db70cece3b378a92c2b76.tar.zst gsoc2013-evolution-4d261c55e56314bd629db70cece3b378a92c2b76.zip |
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
Diffstat (limited to 'calendar/ChangeLog')
-rw-r--r-- | calendar/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
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 <jpr@ximian.com> * gui/e-meeting-time-sel.c (e_meeting_time_selector_construct): |