From e1776973e1fbb3d6a0b043a3b34ff56c61416a7f Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 13:39:30 +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/Composite.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Composite.c')

diff --git a/src/Composite.c b/src/Composite.c
index c3612cc..a2e43f4 100644
--- a/src/Composite.c
+++ b/src/Composite.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/Composite.c,v 1.6 2001/12/14 19:56:08 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/Composite.c,v 1.5 2001/08/22 22:52:17 dawes Exp $ */
 
 #define COMPOSITE
 #include "IntrinsicI.h"
-- 
cgit v1.2.3