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/Xmessage-color.ad b/Xmessage-color.ad
index e8a2e4c..8d5f433 100644
--- a/Xmessage-color.ad
+++ b/Xmessage-color.ad
@@ -1,4 +1,4 @@
-! $XFree86: xc/programs/xmessage/Xmessage-color.ad,v 1.1 2002/10/15 02:26:12 dawes Exp $
+! $XFree86$
 
 #include "Xmessage"
 
diff --git a/makeform.c b/makeform.c
index 41b6707..ad16098 100644
--- a/makeform.c
+++ b/makeform.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xmessage/makeform.c,v 1.7 2003/04/14 23:03:13 herrb Exp $ */
+/* $XFree86: xc/programs/xmessage/makeform.c,v 1.6 2002/11/22 03:56:39 paulo Exp $ */
 
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
diff --git a/readfile.c b/readfile.c
index 77016d2..9729854 100644
--- a/readfile.c
+++ b/readfile.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xmessage/readfile.c,v 1.3 2003/04/14 23:03:13 herrb Exp $ */
+/* $XFree86: xc/programs/xmessage/readfile.c,v 1.2 2000/02/14 19:21:04 dawes Exp $ */
 
 #include <X11/Xos.h>			/* for types.h */
 #include <sys/stat.h>
diff --git a/xmessage.c b/xmessage.c
index 9b559ff..125b28c 100644
--- a/xmessage.c
+++ b/xmessage.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xmessage/xmessage.c,v 1.5 2003/04/14 23:03:13 herrb Exp $ */
+/* $XFree86: xc/programs/xmessage/xmessage.c,v 1.4 2000/02/17 16:53:03 dawes Exp $ */
 
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
diff --git a/xmessage.man b/xmessage.man
index 728161d..016ba88 100644
--- a/xmessage.man
+++ b/xmessage.man
@@ -1,6 +1,6 @@
 .\" $XConsortium: xmessage.man,v 1.8 95/03/08 22:28:48 gildea Exp $
 .\"
-.\" $XFree86: xc/programs/xmessage/xmessage.man,v 1.3 2001/01/27 18:21:19 dawes Exp $
+.\" $XFree86$
 .\"
 .TH XMESSAGE 1 __xorgversion__
 .SH NAME