merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGECYGWIN-PRE-6_8_0-MERGECYGWIN-HEAD-MERGECYGWIN-HEAD-LAST-MERGECYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGECYGWIN

4 files changed, 4 insertions, 4 deletions

diff --git a/SCCDFile.h b/SCCDFile.h
index d1455a9..a9a7722 100644
--- a/SCCDFile.h
+++ b/SCCDFile.h
@@ -28,7 +28,7 @@
  *		X Device Color Characterization Convention (XDCCC).
  *
  */
-/* $XFree86: xc/programs/xcmsdb/SCCDFile.h,v 1.4 2001/01/17 23:45:19 dawes Exp $ */
+/* $XFree86: xc/programs/xcmsdb/SCCDFile.h,v 1.3 1999/03/02 11:49:36 dawes Exp $ */
 #ifndef SCCDFILE_H
 #define SCCDFILE_H
 
diff --git a/loadData.c b/loadData.c
index 7ad1497..8d2cbac 100644
--- a/loadData.c
+++ b/loadData.c
@@ -31,7 +31,7 @@
  *
  *
  */
-/* $XFree86: xc/programs/xcmsdb/loadData.c,v 3.4 2003/09/24 02:43:38 dawes Exp $ */
+/* $XFree86: xc/programs/xcmsdb/loadData.c,v 3.3 2001/07/25 15:05:18 dawes Exp $ */
 
 /*
  *      INCLUDES
diff --git a/xcmsdb.c b/xcmsdb.c
index 49201fd..f0e5e34 100644
--- a/xcmsdb.c
+++ b/xcmsdb.c
@@ -29,7 +29,7 @@
  *		Characterization Data from the root window of the screen.
  *
  */
-/* $XFree86: xc/programs/xcmsdb/xcmsdb.c,v 1.6 2001/04/01 14:00:19 tsi Exp $ */
+/* $XFree86: xc/programs/xcmsdb/xcmsdb.c,v 1.5 2001/01/17 23:45:19 dawes Exp $ */
 
 /*
  *      INCLUDES
diff --git a/xcmsdb.man b/xcmsdb.man
index 7cae4db..29c961c 100644
--- a/xcmsdb.man
+++ b/xcmsdb.man
@@ -24,7 +24,7 @@
 .\" dealing in this Software without prior written authorization from the 
 .\" The Open Group.
 .\"
-.\" $XFree86: xc/programs/xcmsdb/xcmsdb.man,v 1.7 2001/12/14 20:01:18 dawes Exp $
+.\" $XFree86: xc/programs/xcmsdb/xcmsdb.man,v 1.6 2001/01/27 18:21:09 dawes Exp $
 .\"
 .TH XCMSDB 1 __xorgversion__
 .SH NAME