From aa42ac4d09fa65d5889c8f01b18e091fbaa96312 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:27 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich). --- choice.c | 2 +- dashlist.c | 2 +- getfile.c | 2 +- gram.y | 2 +- interpret.c | 2 +- lex.l | 2 +- main.c | 2 +- main.h | 2 +- planemask.c | 2 +- record.c | 2 +- testfrac.c | 2 +- tests.c | 2 +- text.c | 2 +- tile | 2 +- xgc.h | 2 +- xgc.man | 2 +- 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 #include 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 #include 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 #include 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 #include 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 #include 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 #include 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 #include 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 -- cgit v1.2.3