aboutsummaryrefslogtreecommitdiffstats
path: root/libical/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'libical/ChangeLog')
-rw-r--r--libical/ChangeLog7
1 files changed, 6 insertions, 1 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog
index a86513c7ab..8629b05d5b 100644
--- a/libical/ChangeLog
+++ b/libical/ChangeLog
@@ -1,6 +1,11 @@
2001-07-03 Damon Chaplin <damon@ximian.com>
- * src/libical/icaltimezone.c (icaltimezone_get_builtin_timezone_from_tzid):
+ * src/libical/icalcomponent.c (icalcomponent_merge_component): fixed
+ bad assertion, '!=' -> '=='.
+ (icalcomponent_merge_vtimezone): get the TZID from vtimezone, not comp.
+
+2001-07-03 Damon Chaplin <damon@ximian.com>
+
* src/libical/icaltime.c:
* src/libical/icalcomponent.c: more timezone stuff.