From 26eee7328031f78b063ab71265ef4fddc8619c72 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@src.gnome.org>
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/THANKS | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'libical/THANKS')

diff --git a/libical/THANKS b/libical/THANKS
index 6e867ffe27..ee804111e9 100644
--- a/libical/THANKS
+++ b/libical/THANKS
@@ -22,3 +22,17 @@ 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.
+
+The Evolution team at Helixcode ( Federico Mena Quintero
+<federico@helixcode.com>, JP Rosevear <jpr@helixcode.com>, Ettore
+Perazzoli <ettore@helixcode.com>, Christopher James Lahey
+<clahey@helixcode.com>, Peter Williams <peterw@helixcode.com>) for
+miscelaneous patches and adjustments to the build system.
+
+Cornelius Schumacher <schumacher@kde.org> for many insightful
+suggestions and a few patches.
+
+Mark D. Anderson <mda@discerning.com> for discussions and ideas. 
+
+Martin Neimeier <nei@ibn.de>   for correcting bugs in icalrecur.c
+
-- 
cgit v1.2.3