From 35601667a0c5f24a779f117d050d269dbb0c70da Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed, 17 Mar 2004 20:32:13 +0000
Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)

---
 fslsfonts.c   | 2 +-
 fslsfonts.man | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fslsfonts.c b/fslsfonts.c
index 2ca2baf..9760db2 100644
--- a/fslsfonts.c
+++ b/fslsfonts.c
@@ -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/programs/fslsfonts/fslsfonts.c,v 3.8 2001/12/14 20:00:45 dawes Exp $ */
+/* $XFree86: xc/programs/fslsfonts/fslsfonts.c,v 3.7 2001/08/27 17:41:01 dawes Exp $ */
 
 #include <X11/fonts/FSlib.h>
 #include <stdio.h>
diff --git a/fslsfonts.man b/fslsfonts.man
index 2dfb2ad..891aa0e 100644
--- a/fslsfonts.man
+++ b/fslsfonts.man
@@ -24,7 +24,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/fslsfonts/fslsfonts.man,v 1.7 2001/12/14 20:00:45 dawes Exp $
+.\" $XFree86: xc/programs/fslsfonts/fslsfonts.man,v 1.6 2001/01/27 18:21:01 dawes Exp $
 .\"
 .TH FSLSFONTS 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3