JP Rosevear 73a6d43a66 Fix minor conflicts. ...

svn path=/trunk/; revision=5017

2000-08-24 20:12:06 +00:00

..

.cvsignore

…

0

…

1

…

1.1

…

2

…

3

…

4

…

5

…

6

…

7

…

2445.ics

…

2445.vcd

…

2446.ics

…

2446.vcd

…

complex-mime.txt

Initial revision

2000-08-24 19:31:03 +00:00

Makefile.am

Fix minor conflicts.

2000-08-24 20:12:06 +00:00

recur.txt

Initial revision

2000-08-24 19:31:03 +00:00

simple-mime.txt

Initial revision

2000-08-24 19:31:03 +00:00

smallcluster.ics

…

smallcluster.vcd

…

user-cal.vcf

Initial revision

2000-08-24 19:31:03 +00:00