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).

---
 include/X11/ResConfigP.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/X11/ResConfigP.h')

diff --git a/include/X11/ResConfigP.h b/include/X11/ResConfigP.h
index 2fe22ee..a06cda7 100644
--- a/include/X11/ResConfigP.h
+++ b/include/X11/ResConfigP.h
@@ -52,7 +52,7 @@ dealings in this Software without prior written authorization from the IBM
 Corporation.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/ResConfigP.h,v 3.8 2003/04/21 16:34:28 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/ResConfigP.h,v 3.7 2001/12/20 19:40:59 tsi Exp $ */
 
 #ifndef _RESCONFIGP_H
 #define _RESCONFIGP_H
-- 
cgit v1.2.3