From d3d13b9fabeca1b065bcea19e87168448d11d9f3 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)

---
 chars.c     | 2 +-
 fstobdf.c   | 2 +-
 fstobdf.man | 2 +-
 header.c    | 2 +-
 props.c     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/chars.c b/chars.c
index 5c7cf81..5e91f2b 100644
--- a/chars.c
+++ b/chars.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/fstobdf/chars.c,v 3.8 2001/12/14 20:00:45 dawes Exp $ */
+/* $XFree86: xc/programs/fstobdf/chars.c,v 3.7 2001/03/04 00:16:31 tsi Exp $ */
 
 /* Morten Storgaard Nielsen: chars.c,v 3.2-1 2000/01/30 14:11:19 kat Exp */
 
diff --git a/fstobdf.c b/fstobdf.c
index 3161fa1..d21d654 100644
--- a/fstobdf.c
+++ b/fstobdf.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/fstobdf/fstobdf.c,v 1.7 2003/07/09 15:27:36 tsi Exp $ */
+/* $XFree86: xc/programs/fstobdf/fstobdf.c,v 1.6tsi Exp $ */
 
 #include	<stdio.h>
 #include	<stdlib.h>
diff --git a/fstobdf.man b/fstobdf.man
index 8e40bf2..f76b009 100644
--- a/fstobdf.man
+++ b/fstobdf.man
@@ -24,7 +24,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/fstobdf/fstobdf.man,v 1.7 2001/12/14 20:00:46 dawes Exp $
+.\" $XFree86: xc/programs/fstobdf/fstobdf.man,v 1.6 2001/01/27 18:21:02 dawes Exp $
 .\"
 .TH FSTOBDF 1 __xorgversion__
 .SH NAME
diff --git a/header.c b/header.c
index 291ba01..7350b85 100644
--- a/header.c
+++ b/header.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/fstobdf/header.c,v 3.7 2001/12/14 20:00:46 dawes Exp $ */
+/* $XFree86: xc/programs/fstobdf/header.c,v 3.6 2001/07/25 15:05:13 dawes Exp $ */
 
 #include	<stdio.h>
 #include	<X11/Xosdefs.h>
diff --git a/props.c b/props.c
index d3dc92a..29e3249 100644
--- a/props.c
+++ b/props.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/fstobdf/props.c,v 1.6 2001/12/14 20:00:46 dawes Exp $ */
+/* $XFree86: xc/programs/fstobdf/props.c,v 1.5 2001/01/17 23:44:54 dawes Exp $ */
 
 #include	<stdio.h>
 #include	<string.h>
-- 
cgit v1.2.3