diff options
Diffstat (limited to 'calendar/ChangeLog')
| -rw-r--r-- | calendar/ChangeLog | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 2f602c05e7..b31b6bad5b 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,8 +1,7 @@ -<<<<<<< ChangeLog 1998-04-20 Miguel de Icaza <miguel@nuclecu.unam.mx> * eventedit.c (ee_ok): Mark the event as non-new after accepting changes. -======= + 1998-04-20 Federico Mena Quintero <federico@nuclecu.unam.mx> * gncal-full-day.c (gncal_full_day_get_day_start_yoffset): New @@ -23,7 +22,6 @@ is_date_in_list(). 1998-04-20 Miguel de Icaza <miguel@nuclecu.unam.mx> ->>>>>>> 1.58 * calobj.c (duration_callback): Take exception dates into account. |