From 26eee7328031f78b063ab71265ef4fddc8619c72 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Mon, 11 Dec 2000 23:01:26 +0000 Subject: Fix fucking CVS conflicts because fucking CVS is a fucking big doofus - Federico svn path=/trunk/; revision=6920 --- libical/test-data/1 | 2 +- libical/test-data/2445.ics | 7 +++++++ libical/test-data/2446.ics | 2 ++ libical/test-data/Makefile.am | 8 +++++++- 4 files changed, 17 insertions(+), 2 deletions(-) (limited to 'libical/test-data') diff --git a/libical/test-data/1 b/libical/test-data/1 index 6a368d9997..3670e54141 100644 --- a/libical/test-data/1 +++ b/libical/test-data/1 @@ -11,7 +11,7 @@ TZOFFSETTO:-0500 TZNAME:EST END:STANDARD BEGIN:DAYLIGHT -DTSTART:19990404T020000 +DTSTAR:19990404T020000 RDATE:19990404T020000 TZOFFSETFROM:-0500 TZOFFSETTO:-0400 diff --git a/libical/test-data/2445.ics b/libical/test-data/2445.ics index f225f26331..7cce109ec3 100644 --- a/libical/test-data/2445.ics +++ b/libical/test-data/2445.ics @@ -50,6 +50,7 @@ CATEGORIES:FAMILY,FINANCE PRIORITY:1 STATUS:NEEDS-ACTION END:VTODO + BEGIN:VJOURNAL UID:19970901T130000Z-123405@host.com DTSTAMP:19970901T1300Z @@ -71,16 +72,20 @@ DTSTART:19971015T050000Z DTEND:19971016T050000Z DTSTAMP:19970901T083000Z END:VFREEBUSY + BEGIN:VFREEBUSY ORGANIZER:MAILTO:jane_doe@host1.com ATTENDEE:MAILTO:john_public@host2.com DTSTAMP:19970901T100000Z +DTSTART:19971015T050000Z +DTEND:19971016T050000Z FREEBUSY;VALUE=PERIOD:19971015T050000Z/PT8H30M, 19971015T160000Z/PT5H30M,19971015T223000Z/PT6H30M URL:http://host2.com/pub/busy/jpublic-01.ifb COMMENT:This iCalendar file contains busy time information for the next three months. END:VFREEBUSY + BEGIN:VFREEBUSY ORGANIZER:jsmith@host.com DTSTART:19980313T141711Z @@ -261,6 +266,7 @@ ATTACH;FMTTYPE=application/postscript:ftp://xyzCorp.com/pub/ conf/bkgrnd.ps END:VEVENT END:VCALENDAR + BEGIN:VCALENDAR VERSION:2.0 PRODID:-//ABC Corporation//NONSGML My Product//EN @@ -283,6 +289,7 @@ DURATION:PT1H END:VALARM END:VTODO END:VCALENDAR + BEGIN:VCALENDAR VERSION:2.0 PRODID:-//ABC Corporation//NONSGML My Product//EN diff --git a/libical/test-data/2446.ics b/libical/test-data/2446.ics index 0f816efeba..0b86aa42c1 100644 --- a/libical/test-data/2446.ics +++ b/libical/test-data/2446.ics @@ -230,6 +230,7 @@ UID:calsrv.example.com-873970198738777@example.com DTSTAMP:19970614T190000Z END:VEVENT END:VCALENDAR + BEGIN:VCALENDAR PRODID:-//ACME/DesktopCalendar//EN METHOD:REPLY @@ -244,6 +245,7 @@ REQUEST-STATUS:2.0;Success DTSTAMP:19970611T190000Z END:VEVENT END:VCALENDAR + BEGIN:VCALENDAR PRODID:-//ACME/DesktopCalendar//EN METHOD:REQUEST diff --git a/libical/test-data/Makefile.am b/libical/test-data/Makefile.am index 83a434b288..c3475a9c31 100644 --- a/libical/test-data/Makefile.am +++ b/libical/test-data/Makefile.am @@ -15,6 +15,12 @@ recur.txt \ user-cal.vcf \ complex-mime.txt \ simple-mime.txt \ -stresstest.ics +stresstest.ics \ +classify.ics \ +incoming.ics \ +process-incoming.ics \ +calendar.ics \ +restriction.ics \ +overlaps.ics -- cgit v1.2.3