diff options
Diffstat (limited to 'calendar/ChangeLog')
| -rw-r--r-- | calendar/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 2a3844a5a6..2f602c05e7 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +<<<<<<< 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 @@ -18,6 +23,7 @@ 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. |