From 14e2551db92a44684cb96ab30a483f057d71d571 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 13:39:26 +0000
Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected
 files.     Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
     future conflicts on ASCII but not humal readable files. (There should    
 probably be separate CreditsXorg.rtf files) (Egbert Eich).

---
 src/Xinerama.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Xinerama.c b/src/Xinerama.c
index 7138613..43084b2 100644
--- a/src/Xinerama.c
+++ b/src/Xinerama.c
@@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 ******************************************************************/
-/* $XFree86: xc/lib/Xinerama/Xinerama.c,v 1.3 2002/10/16 00:37:31 dawes Exp $ */
+/* $XFree86: xc/lib/Xinerama/Xinerama.c,v 1.2 2001/07/23 17:20:28 dawes Exp $ */
 
 #define NEED_EVENTS
 #define NEED_REPLIES
-- 
cgit v1.2.1