JP Rosevear 73a6d43a66 Fix minor conflicts. ...

svn path=/trunk/; revision=5017

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

..

.cvsignore

reparing damage from removing files

2000-05-15 06:18:21 +00:00

0

merge libical-0.17 onto the head

2000-06-06 22:48:11 +00:00

1

merge libical-0.17 onto the head

2000-06-06 22:48:11 +00:00

1.1

reparing damage from removing files

2000-05-15 06:18:21 +00:00

2

reparing damage from removing files

2000-05-15 06:18:21 +00:00

3

reparing damage from removing files

2000-05-15 06:18:21 +00:00

4

reparing damage from removing files

2000-05-15 06:18:21 +00:00

5

reparing damage from removing files

2000-05-15 06:18:21 +00:00

6

merge libical-0.17 onto the head

2000-06-06 22:48:11 +00:00

7

reparing damage from removing files

2000-05-15 06:18:21 +00:00

2445.ics

merge libical-0.17 onto the head

2000-06-06 22:48:11 +00:00

2445.vcd

reparing damage from removing files

2000-05-15 06:18:21 +00:00

2446.ics

merge libical-0.17 onto the head

2000-06-06 22:48:11 +00:00

2446.vcd

reparing damage from removing files

2000-05-15 06:18:21 +00:00

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

merge libical-0.17 onto the head

2000-06-06 22:48:11 +00:00

smallcluster.vcd

reparing damage from removing files

2000-05-15 06:18:21 +00:00

user-cal.vcf

Initial revision

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