Merging XORG-CURRENT into trunkxprint_packagertest_20041217_basexprint_packagertest_20041125_basesco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGExprint_packagertest_20041217xprint_packagertest_20041125sco_port_updatelg3d-masterlg3d-eventlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-latestlg3d-dev-0-6-2lg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3d-dev-0-6-1-1lg3d-dev-0-6-1lg3dXORG-6_8-branchCOMPOSITEWRAP

5 files changed, 5 insertions, 5 deletions

diff --git a/Eyes.c b/Eyes.c
index 71c3c26..181d794 100644
--- a/Eyes.c
+++ b/Eyes.c
@@ -1,5 +1,5 @@
 /* $XConsortium: Eyes.c,v 1.28 94/04/17 20:45:22 eswu Exp $ */
-/* $XFree86: xc/programs/xeyes/Eyes.c,v 1.4 2001/08/27 23:35:13 dawes Exp $ */
+/* $XFree86: xc/programs/xeyes/Eyes.c,v 1.3 2001/07/25 15:05:21 dawes Exp $ */
 /*
 
 Copyright (c) 1991  X Consortium
diff --git a/transform.c b/transform.c
index 9495790..be4896c 100644
--- a/transform.c
+++ b/transform.c
@@ -1,7 +1,7 @@
 /*
  * transformed coordinate system objects for X
  */
-/* $XFree86: xc/programs/xeyes/transform.c,v 1.4 2001/08/27 23:35:13 dawes Exp $ */
+/* $XFree86: xc/programs/xeyes/transform.c,v 1.3 2000/02/17 14:00:35 dawes Exp $ */
 
 # include	<X11/Xos.h>
 # include	<stdlib.h>
diff --git a/transform.h b/transform.h
index b22620d..5bd5182 100644
--- a/transform.h
+++ b/transform.h
@@ -2,7 +2,7 @@
  * header file for transformed coordinate system.  No rotations
  * supported, as elipses cannot be rotated in X.
  */
-/* $XFree86: xc/programs/xeyes/transform.h,v 1.3 2000/02/17 14:00:35 dawes Exp $ */
+/* $XFree86$ */
 
 typedef struct _transform {
 	double	mx, bx;
diff --git a/xeyes.c b/xeyes.c
index a78cea1..24b36b0 100644
--- a/xeyes.c
+++ b/xeyes.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xeyes/xeyes.c,v 1.4 2001/08/27 23:35:13 dawes Exp $ */
+/* $XFree86: xc/programs/xeyes/xeyes.c,v 1.3 2000/02/17 14:00:35 dawes Exp $ */
 
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
diff --git a/xeyes.man b/xeyes.man
index 3b2d22c..0d74d7e 100644
--- a/xeyes.man
+++ b/xeyes.man
@@ -1,6 +1,6 @@
 .\" $XConsortium: xeyes.man,v 1.12 94/04/17 20:45:24 gildea Exp $
 .\"
-.\" $XFree86: xc/programs/xeyes/xeyes.man,v 1.4 2003/05/29 21:48:11 herrb Exp $
+.\" $XFree86: xc/programs/xeyes/xeyes.man,v 1.3 2001/01/27 18:21:12 dawes Exp $
 .\"
 .TH XEYES 1 __xorgversion__
 .SH NAME