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

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

diff --git a/xstdcmap.c b/xstdcmap.c
index 1c0c53c..04467d1 100644
--- a/xstdcmap.c
+++ b/xstdcmap.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
  * *
  * Author:  Donna Converse, MIT X Consortium
  */
-/* $XFree86: xc/programs/xstdcmap/xstdcmap.c,v 1.9 2003/03/26 20:44:00 tsi Exp $ */
+/* $XFree86: xc/programs/xstdcmap/xstdcmap.c,v 1.8tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xstdcmap.man b/xstdcmap.man
index 09c045c..0ce2b9f 100644
--- a/xstdcmap.man
+++ b/xstdcmap.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xstdcmap/xstdcmap.man,v 1.8 2001/12/14 20:02:30 dawes Exp $
+.\" $XFree86: xc/programs/xstdcmap/xstdcmap.man,v 1.7 2001/01/27 18:21:24 dawes Exp $
 .\"
 .de EX		\"Begin example
 .ne 5
-- 
cgit v1.2.3