From 73a6d43a66a828b09e2c1b5a483405e6e0b5fa6a Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@src.gnome.org>
Date: Thu, 24 Aug 2000 20:12:06 +0000
Subject: Fix minor conflicts.

svn path=/trunk/; revision=5017
---
 libical/THANKS | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'libical/THANKS')

diff --git a/libical/THANKS b/libical/THANKS
index 6a51d866fa..6e867ffe27 100644
--- a/libical/THANKS
+++ b/libical/THANKS
@@ -1,5 +1,7 @@
 Thanks to: 
 
+Allan Clark <allanc@atlas.platypus.bc.ca> for testing libical against
+UnixWare.
 
 Graham Davison <g.m.davison@computer.org> for MacOS support and
 miscelaneous code bits
@@ -7,4 +9,16 @@ miscelaneous code bits
 Seth Alves <alves@hungry.com> for the first cut at the Makefile.am
 files and various utility functions.
 
-Russ Steinthal <rms39@columbia.edu> for several utility functions and comments. 
\ No newline at end of file
+Russ Steinthal <rms39@columbia.edu> for several utility functions and
+comments.
+
+Ola Lundqvist <olalu526@student.liu.se> for the vCal test data file. 
+
+Colin DuPlantis <colin@cp.net> for new functions in icalparser.c
+
+Holger Schmidt <hschmidt@chronolabs.de> for all of icalcstp.c, The
+CSTP protocol implementation, and modifications to icalcstp.h
+
+Gisle Hannemyr <gisle@oslonett.no> The decode*() functions in sspm.c
+are based on the decode() routine in the mimelite program, Copyright
+(c) 1994 Gisle Hannemyr.
-- 
cgit v1.2.3