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

---
 Clock.c     | 2 +-
 Clock.h     | 2 +-
 ClockP.h    | 2 +-
 oclock.c    | 2 +-
 oclock.man  | 2 +-
 transform.c | 2 +-
 transform.h | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Clock.c b/Clock.c
index bf992ba..66fea36 100644
--- a/Clock.c
+++ b/Clock.c
@@ -23,7 +23,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/oclock/Clock.c,v 1.7 2001/12/14 20:01:00 dawes Exp $ */
+/* $XFree86: xc/programs/oclock/Clock.c,v 1.6 2001/07/25 15:05:15 dawes Exp $ */
 
 /*
  * Clock.c
diff --git a/Clock.h b/Clock.h
index 06fd935..48baf5e 100644
--- a/Clock.h
+++ b/Clock.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/oclock/Clock.h,v 1.5 2001/12/14 20:01:00 dawes Exp $ */
+/* $XFree86: xc/programs/oclock/Clock.h,v 1.4 2001/01/17 23:45:01 dawes Exp $ */
 
 #ifndef _XtClock_h
 #define _XtClock_h
diff --git a/ClockP.h b/ClockP.h
index b7e5b8a..cc075a8 100644
--- a/ClockP.h
+++ b/ClockP.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/oclock/ClockP.h,v 1.5 2001/12/14 20:01:00 dawes Exp $ */
+/* $XFree86: xc/programs/oclock/ClockP.h,v 1.4 2001/01/17 23:45:01 dawes Exp $ */
 
 
 #ifndef _ClockP_h
diff --git a/oclock.c b/oclock.c
index d86cd4f..cb2fc8d 100644
--- a/oclock.c
+++ b/oclock.c
@@ -23,7 +23,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/oclock/oclock.c,v 1.8 2003/05/27 22:26:57 tsi Exp $ */
+/* $XFree86: xc/programs/oclock/oclock.c,v 1.7tsi Exp $ */
 
 #include <X11/Intrinsic.h>
 #include <X11/Xatom.h>
diff --git a/oclock.man b/oclock.man
index 3431033..60b6096 100644
--- a/oclock.man
+++ b/oclock.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/oclock/oclock.man,v 1.9 2002/10/12 16:06:45 herrb Exp $
+.\" $XFree86: xc/programs/oclock/oclock.man,v 1.8 2001/12/14 20:01:00 dawes Exp $
 .\"
 .TH OCLOCK 1 __xorgversion__
 .SH NAME
diff --git a/transform.c b/transform.c
index 7f78da1..2b662d2 100644
--- a/transform.c
+++ b/transform.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/oclock/transform.c,v 3.5 2001/12/14 20:01:00 dawes Exp $ */
+/* $XFree86: xc/programs/oclock/transform.c,v 3.4 2001/07/25 15:05:15 dawes Exp $ */
 
 
 /*
diff --git a/transform.h b/transform.h
index 47ec2ed..ae88200 100644
--- a/transform.h
+++ b/transform.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/oclock/transform.h,v 1.5 2001/12/14 20:01:00 dawes Exp $ */
+/* $XFree86: xc/programs/oclock/transform.h,v 1.4 2001/01/17 23:45:01 dawes Exp $ */
 
 
 /*
-- 
cgit v1.2.3