Fix minor conflicts.

svn path=/trunk/; revision=5017

1 files changed, 7 insertions, 2 deletions

diff --git a/libical/README b/libical/README
index e0f7641e1e..ce27e309c0 100644
--- a/libical/README
+++ b/libical/README
@@ -17,6 +17,11 @@ The code in this distribution implements the iCal protocols as
 described in RFC2445 and RFC2446. The code is in very early stages of
 development.
 
+Portions of this distribution are (C) Copyright 1996 Apple Computer,
+Inc., AT&T Corp., International Business Machines Corporation and
+Siemens Rolm Communications Inc. See src/libicalvcal/README.TXT for
+details.
+
 This code is under active development. If you would like to contribute
 to the project, you can contact me, Eric Busboom, at
 eric@softwarestudio.org. The project has a webpage at
@@ -36,8 +41,8 @@ Building the library
 
 This distribution is developed on Red Hat Linux 6.0 and usually
 compiles on SunOS 5.6 and FreeBSD 2.27. I have reports of success of
-previous version on MacOS ( with CodeWarrior ) but I don't know about
-any other systems.
+previous version on MacOS ( with CodeWarrior ) and on UnixWare, but I
+don't know about any other systems.
 
 The library is configured with automake. From the root directory, run