From 5881d556fee5df2352f6868be6be4ab9977c4704 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 13:41:36 +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).

---
 dsimple.c    | 2 +-
 dsimple.h    | 2 +-
 xlsfonts.c   | 2 +-
 xlsfonts.man | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dsimple.c b/dsimple.c
index cd4cbc9..8cdce02 100644
--- a/dsimple.c
+++ b/dsimple.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.7 2003/09/24 02:43:38 dawes Exp $ */
+/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.6 2001/12/14 20:02:09 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
diff --git a/dsimple.h b/dsimple.h
index 7efd5c0..ae520aa 100644
--- a/dsimple.h
+++ b/dsimple.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.9 2003/11/17 22:20:54 dawes Exp $ */
+/* $XFree86: xc/programs/xlsfonts/dsimple.h,v 1.8 2002/12/24 17:43:01 tsi Exp $ */
 
 /*
  * Just_display.h: This file contains the definitions needed to use the
diff --git a/xlsfonts.c b/xlsfonts.c
index fa22341..2acbcb2 100644
--- a/xlsfonts.c
+++ b/xlsfonts.c
@@ -24,7 +24,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xlsfonts/xlsfonts.c,v 1.10 2003/09/13 21:33:11 dawes Exp $ */
+/* $XFree86: xc/programs/xlsfonts/xlsfonts.c,v 1.9 2003/09/08 14:25:33 eich Exp $ */
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/xlsfonts.man b/xlsfonts.man
index 056398c..c9f4a8f 100644
--- a/xlsfonts.man
+++ b/xlsfonts.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xlsfonts/xlsfonts.man,v 1.8 2001/12/14 20:02:10 dawes Exp $
+.\" $XFree86: xc/programs/xlsfonts/xlsfonts.man,v 1.7 2001/01/27 18:21:18 dawes Exp $
 .\"
 .TH XLSFONTS 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3