aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/ChangeLog
diff options
context:
space:
mode:
authorArturo Espinosa <unammx@src.gnome.org>1998-04-21 11:22:09 +0800
committerArturo Espinosa <unammx@src.gnome.org>1998-04-21 11:22:09 +0800
commit07239d418cf2910ac2240559515fae5851db2868 (patch)
tree39e385a60585852301c1f0d4f6047d5567cfa1ed /calendar/ChangeLog
parent5fda22d8393b161a6539b848bdd5d88db7e77bc5 (diff)
downloadgsoc2013-evolution-07239d418cf2910ac2240559515fae5851db2868.tar.gz
gsoc2013-evolution-07239d418cf2910ac2240559515fae5851db2868.tar.zst
gsoc2013-evolution-07239d418cf2910ac2240559515fae5851db2868.zip
Enhance the exception date handling -mig
svn path=/trunk/; revision=174
Diffstat (limited to 'calendar/ChangeLog')
-rw-r--r--calendar/ChangeLog6
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.