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_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

16 files changed, 16 insertions, 16 deletions

diff --git a/choice.c b/choice.c
index 5b0abcd..42ca1cb 100644
--- a/choice.c
+++ b/choice.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xgc/choice.c,v 1.3 2003/10/24 20:38:18 tsi Exp $ */
+/* $XFree86$ */
 /*
 ** xgc
 **
diff --git a/dashlist.c b/dashlist.c
index c9cb4ec..14a67c3 100644
--- a/dashlist.c
+++ b/dashlist.c
@@ -7,7 +7,7 @@
 **       functions to create more than one of these dashlist choice things
 **       will fail in a big way.
 */
-/* $XFree86: xc/programs/xgc/dashlist.c,v 1.4 2003/05/07 21:02:06 herrb Exp $ */
+/* $XFree86: xc/programs/xgc/dashlist.c,v 1.3 2001/07/29 21:23:21 tsi Exp $ */
 
 #include <stdio.h>
 #include <X11/Xos.h>
diff --git a/getfile.c b/getfile.c
index de2e1f3..43bba8b 100644
--- a/getfile.c
+++ b/getfile.c
@@ -2,7 +2,7 @@
 ** getfilename.c
 **
 */
-/* $XFree86: xc/programs/xgc/getfile.c,v 1.5 2003/05/27 22:27:06 tsi Exp $ */
+/* $XFree86: xc/programs/xgc/getfile.c,v 1.4tsi Exp $ */
 
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
diff --git a/gram.y b/gram.y
index 58f2fd4..e9cc92c 100644
--- a/gram.y
+++ b/gram.y
@@ -1,7 +1,7 @@
 /*
 ** grammar for xgc syntax
 */
-/* $XFree86: xc/programs/xgc/gram.y,v 1.4 2003/05/07 21:02:07 herrb Exp $ */
+/* $XFree86: xc/programs/xgc/gram.y,v 1.3 2000/02/17 14:00:36 dawes Exp $ */
 
 %{
 #define YYDEBUG 1
diff --git a/interpret.c b/interpret.c
index ff77c47..9b05c55 100644
--- a/interpret.c
+++ b/interpret.c
@@ -3,7 +3,7 @@
 **
 ** interprets and executes lines in the Xgc syntax.
 */
-/* $XFree86: xc/programs/xgc/interpret.c,v 1.5 2003/05/07 21:02:07 herrb Exp $ */
+/* $XFree86: xc/programs/xgc/interpret.c,v 1.4 2002/01/07 20:38:30 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lex.l b/lex.l
index 52e5245..8b07952 100644
--- a/lex.l
+++ b/lex.l
@@ -1,5 +1,5 @@
 /* $XConsortium: lex.l,v 1.8 94/03/31 20:40:44 rws Exp $ */
-/* $XFree86: xc/programs/xgc/lex.l,v 1.4 2002/05/31 18:46:13 dawes Exp $ */
+/* $XFree86: xc/programs/xgc/lex.l,v 1.3 2000/04/05 18:14:07 dawes Exp $ */
 /*
 ** lex file for xgc syntax
 */
diff --git a/main.c b/main.c
index d269d92..dcf277b 100644
--- a/main.c
+++ b/main.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xgc/main.c,v 1.7 2003/05/27 22:27:06 tsi Exp $ */
+/* $XFree86: xc/programs/xgc/main.c,v 1.6tsi Exp $ */
 
 /* xgc
 **
diff --git a/main.h b/main.h
index 7b52d74..7f0e7b9 100644
--- a/main.h
+++ b/main.h
@@ -5,7 +5,7 @@
 **
 ** Initialization of structures, etc.
 */
-/* $XFree86: xc/programs/xgc/main.h,v 1.3 2000/02/17 14:00:36 dawes Exp $ */
+/* $XFree86$ */
 
 /* The three columns in the XgcData arrays are:
 **   name: the name of the toggle button
diff --git a/planemask.c b/planemask.c
index 1983432..c710562 100644
--- a/planemask.c
+++ b/planemask.c
@@ -7,7 +7,7 @@
 **       functions to create more than one of these planemask choice things
 **       will fail in a big way.
 */
-/* $XFree86: xc/programs/xgc/planemask.c,v 1.4 2003/05/07 21:02:07 herrb Exp $ */
+/* $XFree86: xc/programs/xgc/planemask.c,v 1.3 2000/02/17 14:00:37 dawes Exp $ */
 
 #include <X11/Xos.h>
 #include <stdio.h>
diff --git a/record.c b/record.c
index b10a3b0..db5ec65 100644
--- a/record.c
+++ b/record.c
@@ -3,7 +3,7 @@
 **
 ** record.c
 */
-/* $XFree86: xc/programs/xgc/record.c,v 1.4 2003/05/07 21:02:07 herrb Exp $ */
+/* $XFree86: xc/programs/xgc/record.c,v 1.3 2000/02/17 14:00:37 dawes Exp $ */
 
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
diff --git a/testfrac.c b/testfrac.c
index c00c048..0e5018a 100644
--- a/testfrac.c
+++ b/testfrac.c
@@ -4,7 +4,7 @@
 ** How to make a widget to choose the fraction of tests to be run.
 **
 */
-/* $XFree86: xc/programs/xgc/testfrac.c,v 1.5 2003/09/13 21:33:11 dawes Exp $ */
+/* $XFree86: xc/programs/xgc/testfrac.c,v 1.4 2003/05/07 21:02:07 herrb Exp $ */
 
 #include <stdio.h>
 #include <X11/Intrinsic.h>
diff --git a/tests.c b/tests.c
index 4b3ab8a..dcd32d2 100644
--- a/tests.c
+++ b/tests.c
@@ -1,6 +1,6 @@
 /*
 ** $XConsortium: tests.c,v 1.20 91/06/08 18:57:07 rws Exp $
-** $XFree86: xc/programs/xgc/tests.c,v 1.12 2003/10/24 20:38:18 tsi Exp $
+** $XFree86: xc/programs/xgc/tests.c,v 1.11tsi Exp $
 **
 */
 
diff --git a/text.c b/text.c
index 2193e9a..8204b0b 100644
--- a/text.c
+++ b/text.c
@@ -6,7 +6,7 @@
 ** How to make a text widget that returns a string when the cursor
 ** leaves its window.
 */
-/* $XFree86: xc/programs/xgc/text.c,v 1.4 2003/05/07 21:02:07 herrb Exp $ */
+/* $XFree86: xc/programs/xgc/text.c,v 1.3 2000/02/17 14:00:37 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/tile b/tile
index a66e6cb..46ab826 100644
--- a/tile
+++ b/tile
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/xgc/tile,v 1.2 2001/10/28 03:34:34 tsi Exp $ */
+/* $XFree86$ */
 
 #if !defined(tile_width) && !defined(tile_height)
 
diff --git a/xgc.h b/xgc.h
index e99d78a..c3a7021 100644
--- a/xgc.h
+++ b/xgc.h
@@ -3,7 +3,7 @@
 **
 ** xgc.h
 */
-/* $XFree86: xc/programs/xgc/xgc.h,v 1.6 2003/09/13 21:33:11 dawes Exp $ */
+/* $XFree86: xc/programs/xgc/xgc.h,v 1.5 2003/05/07 21:17:06 herrb Exp $ */
 
 #include "constants.h"
 
diff --git a/xgc.man b/xgc.man
index d4c2787..abcb2d8 100644
--- a/xgc.man
+++ b/xgc.man
@@ -1,6 +1,6 @@
 .\" $XConsortium: xgc.man,v 1.6 94/04/17 20:45:31 gildea Exp $
 .\"
-.\" $XFree86: xc/programs/xgc/xgc.man,v 1.3 2001/01/27 18:21:15 dawes Exp $
+.\" $XFree86$
 .\"
 .TH XGC 1 __xorgversion__
 .SH NAME