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

---
 FS.h         | 2 +-
 FSproto.h    | 2 +-
 font.h       | 2 +-
 fontproto.h  | 2 +-
 fontstruct.h | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/FS.h b/FS.h
index 6015fcb..e907522 100644
--- a/FS.h
+++ b/FS.h
@@ -50,7 +50,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/include/fonts/FS.h,v 1.10 2003/07/18 15:53:24 tsi Exp $ */
+/* $XFree86: xc/include/fonts/FS.h,v 1.9 2003/07/09 15:27:28 tsi Exp $ */
 
 #ifndef _FS_H_
 #define	_FS_H_
diff --git a/FSproto.h b/FSproto.h
index 14c4582..03b2808 100644
--- a/FSproto.h
+++ b/FSproto.h
@@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group.
  * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
  * THIS SOFTWARE.
  */
-/* $XFree86: xc/include/fonts/FSproto.h,v 1.3 2001/12/14 19:53:31 dawes Exp $ */
+/* $XFree86: xc/include/fonts/FSproto.h,v 1.2 2001/08/01 00:44:37 tsi Exp $ */
 
 #ifndef _FS_PROTO_H_
 #define _FS_PROTO_H_
diff --git a/font.h b/font.h
index 7dabdfb..e6a00cd 100644
--- a/font.h
+++ b/font.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/fonts/font.h,v 3.5 2001/01/17 17:53:26 dawes Exp $ */
+/* $XFree86: xc/include/fonts/font.h,v 3.4 2000/11/27 00:10:02 dawes Exp $ */
 /* $NCDXorg: @(#)font.h,v 1.7 1991/06/24 17:00:23 lemke Exp $ */
 
 #ifndef FONT_H
diff --git a/fontproto.h b/fontproto.h
index e30cae1..83c9a00 100644
--- a/fontproto.h
+++ b/fontproto.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/fonts/fontproto.h,v 1.3 2001/04/05 17:42:26 dawes Exp $ */
+/* $XFree86: xc/include/fonts/fontproto.h,v 1.2 1999/09/04 09:14:08 dawes Exp $ */
 
 /***********************************************************
 
diff --git a/fontstruct.h b/fontstruct.h
index 7eb3925..451ed6a 100644
--- a/fontstruct.h
+++ b/fontstruct.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/fonts/fontstruct.h,v 3.4 2001/01/17 17:53:26 dawes Exp $ */
+/* $XFree86: xc/include/fonts/fontstruct.h,v 3.3 1999/08/21 13:47:34 dawes Exp $ */
 
 #ifndef FONTSTR_H
 #define FONTSTR_H
-- 
cgit v1.2.3