From 9a6a831451180326a71dae5f695f49ca12e59819 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 13:38:52 +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).

---
 fontcache.h   | 2 +-
 fontcacheP.h  | 2 +-
 fontcachstr.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fontcache.h b/fontcache.h
index 716905b..b767db1 100644
--- a/fontcache.h
+++ b/fontcache.h
@@ -27,7 +27,7 @@
  *
  *	Id: fontcache.h,v 1.6 1999/01/31 12:41:32 akiyama Exp $
  */
-/* $XFree86: xc/include/extensions/fontcache.h,v 1.4 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/fontcache.h,v 1.3 2001/08/01 00:44:35 tsi Exp $ */
 
 /* THIS IS NOT AN X CONSORTIUM STANDARD */
 
diff --git a/fontcacheP.h b/fontcacheP.h
index 000cc5c..75677f3 100644
--- a/fontcacheP.h
+++ b/fontcacheP.h
@@ -26,7 +26,7 @@
  *
  *	Id: fontcacheP.h,v 1.6 1999/01/31 12:43:53 akiyama Exp $
  */
-/* $XFree86: xc/include/extensions/fontcacheP.h,v 1.5 2001/08/01 00:44:35 tsi Exp $ */
+/* $XFree86: xc/include/extensions/fontcacheP.h,v 1.4 2000/03/01 01:04:21 dawes Exp $ */
 
 #ifndef _FONTCACHEP_H_
 #define _FONTCACHEP_H_
diff --git a/fontcachstr.h b/fontcachstr.h
index d545b2c..eab704e 100644
--- a/fontcachstr.h
+++ b/fontcachstr.h
@@ -27,7 +27,7 @@
  *
  *	Id: fontcachstr.h,v 1.7 1999/01/31 14:58:40 akiyama Exp $
  */
-/* $XFree86: xc/include/extensions/fontcachstr.h,v 1.3 2001/08/01 00:44:35 tsi Exp $ */
+/* $XFree86$ */
 
 /* THIS IS NOT AN X CONSORTIUM STANDARD */
 
-- 
cgit v1.2.3