aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/ChangeLog
diff options
context:
space:
mode:
authorArturo Espinosa <unammx@src.gnome.org>1998-04-21 11:59:50 +0800
committerArturo Espinosa <unammx@src.gnome.org>1998-04-21 11:59:50 +0800
commitfeb0cdbe7ac84e06f97a231592ffe22726ca939a (patch)
tree9e5f9bed0053e1417b2dca230a9c5d6ce2b96840 /calendar/ChangeLog
parent07239d418cf2910ac2240559515fae5851db2868 (diff)
downloadgsoc2013-evolution-feb0cdbe7ac84e06f97a231592ffe22726ca939a.tar.gz
gsoc2013-evolution-feb0cdbe7ac84e06f97a231592ffe22726ca939a.tar.zst
gsoc2013-evolution-feb0cdbe7ac84e06f97a231592ffe22726ca939a.zip
Misc. event handling fixes - Federico
svn path=/trunk/; revision=175
Diffstat (limited to 'calendar/ChangeLog')
-rw-r--r--calendar/ChangeLog4
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.