[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force SVN commit: rev 592 - branches/4.3.0/sid/debian/patches



Author: branden
Date: 2003-09-27 02:42:15 -0500 (Sat, 27 Sep 2003)
New Revision: 592

Modified:
   branches/4.3.0/sid/debian/patches/000_post430.diff
Log:
Cosmetic fix to diff syntax so next committed changeset will be a lot
cleaner.

- debian/patches/000_post430.diff


Modified: branches/4.3.0/sid/debian/patches/000_post430.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_post430.diff	2003-09-27 04:56:32 UTC (rev 591)
+++ branches/4.3.0/sid/debian/patches/000_post430.diff	2003-09-27 07:42:15 UTC (rev 592)
@@ -246,7 +246,7 @@
 RCS file: /cvs/xc/config/cf/NetBSD.cf,v
 retrieving revision 3.108
 retrieving revision 3.108.2.1
-diff -u -u -r3.108 -r3.108.2.1
+diff -u -r3.108 -r3.108.2.1
 --- xc/config/cf/NetBSD.cf	14 Dec 2002 22:36:03 -0000	3.108
 +++ xc/config/cf/NetBSD.cf	17 Sep 2003 05:58:15 -0000	3.108.2.1
 @@ -2,7 +2,7 @@
@@ -276,7 +276,7 @@
 RCS file: /cvs/xc/config/cf/OpenBSD.cf,v
 retrieving revision 3.79
 retrieving revision 3.79.2.1
-diff -u -u -r3.79 -r3.79.2.1
+diff -u -r3.79 -r3.79.2.1
 --- xc/config/cf/OpenBSD.cf	12 Jan 2003 17:03:23 -0000	3.79
 +++ xc/config/cf/OpenBSD.cf	17 Sep 2003 05:58:15 -0000	3.79.2.1
 @@ -1,4 +1,4 @@
@@ -299,7 +299,7 @@
 RCS file: /cvs/xc/config/cf/X11.tmpl,v
 retrieving revision 1.196
 retrieving revision 1.196.2.2
-diff -u -u -r1.196 -r1.196.2.2
+diff -u -r1.196 -r1.196.2.2
 --- xc/config/cf/X11.tmpl	25 Feb 2003 21:57:52 -0000	1.196
 +++ xc/config/cf/X11.tmpl	17 Sep 2003 05:58:15 -0000	1.196.2.2
 @@ -5,7 +5,7 @@
@@ -374,7 +374,7 @@
 RCS file: /cvs/xc/config/cf/darwin.cf,v
 retrieving revision 1.34
 retrieving revision 1.34.2.1
-diff -u -u -r1.34 -r1.34.2.1
+diff -u -r1.34 -r1.34.2.1
 --- xc/config/cf/darwin.cf	4 Dec 2002 04:40:15 -0000	1.34
 +++ xc/config/cf/darwin.cf	17 Sep 2003 05:58:15 -0000	1.34.2.1
 @@ -1,4 +1,4 @@
@@ -396,7 +396,7 @@
 RCS file: /cvs/xc/config/cf/linux.cf,v
 retrieving revision 3.201
 retrieving revision 3.201.2.1
-diff -u -u -r3.201 -r3.201.2.1
+diff -u -r3.201 -r3.201.2.1
 --- xc/config/cf/linux.cf	17 Feb 2003 17:07:32 -0000	3.201
 +++ xc/config/cf/linux.cf	13 Mar 2003 04:10:40 -0000	3.201.2.1
 @@ -4,7 +4,7 @@
@@ -427,7 +427,7 @@
 RCS file: /cvs/xc/config/cf/sun.cf,v
 retrieving revision 3.67
 retrieving revision 3.67.2.1
-diff -u -u -r3.67 -r3.67.2.1
+diff -u -r3.67 -r3.67.2.1
 --- xc/config/cf/sun.cf	22 Nov 2002 22:55:56 -0000	3.67
 +++ xc/config/cf/sun.cf	17 Sep 2003 05:58:15 -0000	3.67.2.1
 @@ -3,7 +3,7 @@
@@ -464,7 +464,7 @@
 RCS file: /cvs/xc/config/cf/xfree86.cf,v
 retrieving revision 3.439
 retrieving revision 3.439.2.2
-diff -u -u -r3.439 -r3.439.2.2
+diff -u -r3.439 -r3.439.2.2
 --- xc/config/cf/xfree86.cf	26 Feb 2003 20:07:59 -0000	3.439
 +++ xc/config/cf/xfree86.cf	23 Apr 2003 19:55:19 -0000	3.439.2.2
 @@ -1,4 +1,4 @@
@@ -503,7 +503,7 @@
 RCS file: /cvs/xc/extras/freetype2/src/base/ftmac.c,v
 retrieving revision 1.2
 retrieving revision 1.2.2.1
-diff -u -u -r1.2 -r1.2.2.1
+diff -u -r1.2 -r1.2.2.1
 --- xc/extras/freetype2/src/base/ftmac.c	1 Jan 2003 22:08:40 -0000	1.2
 +++ xc/extras/freetype2/src/base/ftmac.c	7 May 2003 23:22:37 -0000	1.2.2.1
 @@ -545,11 +545,6 @@
@@ -523,7 +523,7 @@
 RCS file: /cvs/xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mysetjmp.h,v
 retrieving revision 1.1.1.1
 retrieving revision 1.1.1.1.8.1
-diff -u -u -r1.1.1.1 -r1.1.1.1.8.1
+diff -u -r1.1.1.1 -r1.1.1.1.8.1
 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mysetjmp.h	15 Jan 2001 21:48:33 -0000	1.1.1.1
 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mysetjmp.h	13 Mar 2003 04:10:41 -0000	1.1.1.1.8.1
 @@ -31,6 +31,7 @@
@@ -595,7 +595,7 @@
 RCS file: /cvs/xc/include/extensions/Imakefile,v
 retrieving revision 3.53
 retrieving revision 3.53.2.1
-diff -u -u -r3.53 -r3.53.2.1
+diff -u -r3.53 -r3.53.2.1
 --- xc/include/extensions/Imakefile	16 Dec 2002 16:18:49 -0000	3.53
 +++ xc/include/extensions/Imakefile	24 May 2003 22:22:03 -0000	3.53.2.1
 @@ -3,7 +3,7 @@
@@ -621,7 +621,7 @@
 RCS file: /cvs/xc/lib/FS/FSFontInfo.c,v
 retrieving revision 1.2
 retrieving revision 1.2.4.2
-diff -u -u -r1.2 -r1.2.4.2
+diff -u -r1.2 -r1.2.4.2
 --- xc/lib/FS/FSFontInfo.c	14 Dec 2001 19:53:32 -0000	1.2
 +++ xc/lib/FS/FSFontInfo.c	1 Sep 2003 21:05:35 -0000	1.2.4.2
 @@ -65,7 +65,7 @@
@@ -674,7 +674,7 @@
 RCS file: /cvs/xc/lib/FS/FSFtNames.c,v
 retrieving revision 1.2
 retrieving revision 1.2.4.2
-diff -u -u -r1.2 -r1.2.4.2
+diff -u -r1.2 -r1.2.4.2
 --- xc/lib/FS/FSFtNames.c	14 Dec 2001 19:53:32 -0000	1.2
 +++ xc/lib/FS/FSFtNames.c	1 Sep 2003 21:05:35 -0000	1.2.4.2
 @@ -78,7 +78,8 @@
@@ -692,7 +692,7 @@
 RCS file: /cvs/xc/lib/FS/FSGetCats.c,v
 retrieving revision 1.2
 retrieving revision 1.2.4.2
-diff -u -u -r1.2 -r1.2.4.2
+diff -u -r1.2 -r1.2.4.2
 --- xc/lib/FS/FSGetCats.c	14 Dec 2001 19:53:32 -0000	1.2
 +++ xc/lib/FS/FSGetCats.c	1 Sep 2003 21:05:35 -0000	1.2.4.2
 @@ -72,9 +72,10 @@
@@ -713,7 +713,7 @@
 RCS file: /cvs/xc/lib/FS/FSListCats.c,v
 retrieving revision 1.2
 retrieving revision 1.2.4.2
-diff -u -u -r1.2 -r1.2.4.2
+diff -u -r1.2 -r1.2.4.2
 --- xc/lib/FS/FSListCats.c	14 Dec 2001 19:53:32 -0000	1.2
 +++ xc/lib/FS/FSListCats.c	1 Sep 2003 21:05:36 -0000	1.2.4.2
 @@ -78,7 +78,8 @@
@@ -731,7 +731,7 @@
 RCS file: /cvs/xc/lib/FS/FSListExt.c,v
 retrieving revision 1.2
 retrieving revision 1.2.4.2
-diff -u -u -r1.2 -r1.2.4.2
+diff -u -r1.2 -r1.2.4.2
 --- xc/lib/FS/FSListExt.c	14 Dec 2001 19:53:32 -0000	1.2
 +++ xc/lib/FS/FSListExt.c	1 Sep 2003 21:05:36 -0000	1.2.4.2
 @@ -72,7 +72,8 @@
@@ -749,7 +749,7 @@
 RCS file: /cvs/xc/lib/FS/FSOpenServ.c,v
 retrieving revision 1.6
 retrieving revision 1.6.4.2
-diff -u -u -r1.6 -r1.6.4.2
+diff -u -r1.6 -r1.6.4.2
 --- xc/lib/FS/FSOpenServ.c	14 Dec 2001 19:53:33 -0000	1.6
 +++ xc/lib/FS/FSOpenServ.c	1 Sep 2003 21:05:36 -0000	1.6.4.2
 @@ -24,7 +24,7 @@
@@ -806,7 +806,7 @@
 RCS file: /cvs/xc/lib/FS/FSQGlyphs.c,v
 retrieving revision 1.2
 retrieving revision 1.2.4.2
-diff -u -u -r1.2 -r1.2.4.2
+diff -u -r1.2 -r1.2.4.2
 --- xc/lib/FS/FSQGlyphs.c	14 Dec 2001 19:53:33 -0000	1.2
 +++ xc/lib/FS/FSQGlyphs.c	1 Sep 2003 21:05:36 -0000	1.2.4.2
 @@ -85,12 +85,20 @@
@@ -864,7 +864,7 @@
 RCS file: /cvs/xc/lib/FS/FSQXExt.c,v
 retrieving revision 1.5
 retrieving revision 1.5.4.2
-diff -u -u -r1.5 -r1.5.4.2
+diff -u -r1.5 -r1.5.4.2
 --- xc/lib/FS/FSQXExt.c	14 Dec 2001 19:53:33 -0000	1.5
 +++ xc/lib/FS/FSQXExt.c	1 Sep 2003 21:05:36 -0000	1.5.4.2
 @@ -24,7 +24,7 @@
@@ -901,7 +901,7 @@
 RCS file: /cvs/xc/lib/FS/FSQXInfo.c,v
 retrieving revision 1.2
 retrieving revision 1.2.4.2
-diff -u -u -r1.2 -r1.2.4.2
+diff -u -r1.2 -r1.2.4.2
 --- xc/lib/FS/FSQXInfo.c	14 Dec 2001 19:53:33 -0000	1.2
 +++ xc/lib/FS/FSQXInfo.c	1 Sep 2003 21:05:36 -0000	1.2.4.2
 @@ -91,6 +91,9 @@
@@ -919,7 +919,7 @@
 RCS file: /cvs/xc/lib/FS/FSlibint.h,v
 retrieving revision 3.7
 retrieving revision 3.7.4.2
-diff -u -u -r3.7 -r3.7.4.2
+diff -u -r3.7 -r3.7.4.2
 --- xc/lib/FS/FSlibint.h	14 Dec 2001 19:53:33 -0000	3.7
 +++ xc/lib/FS/FSlibint.h	1 Sep 2003 21:05:36 -0000	3.7.4.2
 @@ -50,7 +50,7 @@
@@ -936,7 +936,7 @@
 RCS file: /cvs/xc/lib/FS/FSlibos.h,v
 retrieving revision 3.9
 retrieving revision 3.9.2.1
-diff -u -u -r3.9 -r3.9.2.1
+diff -u -r3.9 -r3.9.2.1
 --- xc/lib/FS/FSlibos.h	31 May 2002 18:45:39 -0000	3.9
 +++ xc/lib/FS/FSlibos.h	1 Sep 2003 21:05:36 -0000	3.9.2.1
 @@ -50,7 +50,7 @@
@@ -967,7 +967,7 @@
 RCS file: /cvs/xc/lib/GL/mesa/src/drv/i830/Imakefile,v
 retrieving revision 1.7
 retrieving revision 1.7.2.1
-diff -u -u -r1.7 -r1.7.2.1
+diff -u -r1.7 -r1.7.2.1
 --- xc/lib/GL/mesa/src/drv/i830/Imakefile	25 Nov 2002 14:04:51 -0000	1.7
 +++ xc/lib/GL/mesa/src/drv/i830/Imakefile	24 May 2003 22:22:04 -0000	1.7.2.1
 @@ -1,4 +1,4 @@
@@ -998,7 +998,7 @@
 RCS file: /cvs/xc/lib/GL/mesa/src/drv/i830/i830_tex.c,v
 retrieving revision 1.4
 retrieving revision 1.4.2.1
-diff -u -u -r1.4 -r1.4.2.1
+diff -u -r1.4 -r1.4.2.1
 --- xc/lib/GL/mesa/src/drv/i830/i830_tex.c	10 Dec 2002 01:26:53 -0000	1.4
 +++ xc/lib/GL/mesa/src/drv/i830/i830_tex.c	7 May 2003 21:59:42 -0000	1.4.2.1
 @@ -25,7 +25,7 @@
@@ -1029,7 +1029,7 @@
 RCS file: /cvs/xc/lib/GL/mesa/src/drv/r200/r200_context.c,v
 retrieving revision 1.2
 retrieving revision 1.2.2.1
-diff -u -u -r1.2 -r1.2.2.1
+diff -u -r1.2 -r1.2.2.1
 --- xc/lib/GL/mesa/src/drv/r200/r200_context.c	16 Dec 2002 16:18:53 -0000	1.2
 +++ xc/lib/GL/mesa/src/drv/r200/r200_context.c	6 May 2003 23:21:44 -0000	1.2.2.1
 @@ -1,4 +1,4 @@
@@ -1051,7 +1051,7 @@
 RCS file: /cvs/xc/lib/GL/mesa/src/drv/r200/r200_swtcl.c,v
 retrieving revision 1.3
 retrieving revision 1.3.2.1
-diff -u -u -r1.3 -r1.3.2.1
+diff -u -r1.3 -r1.3.2.1
 --- xc/lib/GL/mesa/src/drv/r200/r200_swtcl.c	23 Dec 2002 15:29:26 -0000	1.3
 +++ xc/lib/GL/mesa/src/drv/r200/r200_swtcl.c	6 May 2003 23:21:44 -0000	1.3.2.1
 @@ -1,4 +1,4 @@
@@ -1088,7 +1088,7 @@
 RCS file: /cvs/xc/lib/GL/mesa/src/drv/r200/r200_swtcl.h,v
 retrieving revision 1.2
 retrieving revision 1.2.2.1
-diff -u -u -r1.2 -r1.2.2.1
+diff -u -r1.2 -r1.2.2.1
 --- xc/lib/GL/mesa/src/drv/r200/r200_swtcl.h	16 Dec 2002 16:18:55 -0000	1.2
 +++ xc/lib/GL/mesa/src/drv/r200/r200_swtcl.h	6 May 2003 23:21:45 -0000	1.2.2.1
 @@ -1,4 +1,4 @@
@@ -1110,7 +1110,7 @@
 RCS file: /cvs/xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.c,v
 retrieving revision 1.3
 retrieving revision 1.3.2.1
-diff -u -u -r1.3 -r1.3.2.1
+diff -u -r1.3 -r1.3.2.1
 --- xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.c	16 Dec 2002 16:18:55 -0000	1.3
 +++ xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.c	6 May 2003 23:21:45 -0000	1.3.2.1
 @@ -1,4 +1,4 @@
@@ -1190,7 +1190,7 @@
 RCS file: /cvs/xc/lib/GL/mesa/src/drv/radeon/radeon_context.c,v
 retrieving revision 1.7
 retrieving revision 1.7.2.1
-diff -u -u -r1.7 -r1.7.2.1
+diff -u -r1.7 -r1.7.2.1
 --- xc/lib/GL/mesa/src/drv/radeon/radeon_context.c	8 Feb 2003 21:26:45 -0000	1.7
 +++ xc/lib/GL/mesa/src/drv/radeon/radeon_context.c	6 May 2003 23:21:44 -0000	1.7.2.1
 @@ -1,4 +1,4 @@
@@ -1212,7 +1212,7 @@
 RCS file: /cvs/xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.c,v
 retrieving revision 1.4
 retrieving revision 1.4.2.1
-diff -u -u -r1.4 -r1.4.2.1
+diff -u -r1.4 -r1.4.2.1
 --- xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.c	15 Feb 2003 22:18:48 -0000	1.4
 +++ xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.c	6 May 2003 23:21:44 -0000	1.4.2.1
 @@ -1,4 +1,4 @@
@@ -1249,7 +1249,7 @@
 RCS file: /cvs/xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.h,v
 retrieving revision 1.1
 retrieving revision 1.1.2.1
-diff -u -u -r1.1 -r1.1.2.1
+diff -u -r1.1 -r1.1.2.1
 --- xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.h	30 Oct 2002 12:51:57 -0000	1.1
 +++ xc/lib/GL/mesa/src/drv/radeon/radeon_swtcl.h	6 May 2003 23:21:44 -0000	1.1.2.1
 @@ -1,4 +1,4 @@
@@ -1271,7 +1271,7 @@
 RCS file: /cvs/xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c,v
 retrieving revision 1.5
 retrieving revision 1.5.2.1
-diff -u -u -r1.5 -r1.5.2.1
+diff -u -r1.5 -r1.5.2.1
 --- xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c	16 Dec 2002 16:18:59 -0000	1.5
 +++ xc/lib/GL/mesa/src/drv/radeon/radeon_vtxfmt.c	6 May 2003 23:21:44 -0000	1.5.2.1
 @@ -1,4 +1,4 @@
@@ -1351,7 +1351,7 @@
 RCS file: /cvs/xc/lib/GLU/libnurbs/internals/Imakefile,v
 retrieving revision 1.9
 retrieving revision 1.9.2.1
-diff -u -u -r1.9 -r1.9.2.1
+diff -u -r1.9 -r1.9.2.1
 --- xc/lib/GLU/libnurbs/internals/Imakefile	14 Dec 2002 04:41:12 -0000	1.9
 +++ xc/lib/GLU/libnurbs/internals/Imakefile	13 Mar 2003 04:10:41 -0000	1.9.2.1
 @@ -1,4 +1,4 @@
@@ -1374,7 +1374,7 @@
 RCS file: /cvs/xc/lib/X11/XlcDL.c,v
 retrieving revision 1.9
 retrieving revision 1.9.2.1
-diff -u -u -r1.9 -r1.9.2.1
+diff -u -r1.9 -r1.9.2.1
 --- xc/lib/X11/XlcDL.c	25 Nov 2002 14:04:53 -0000	1.9
 +++ xc/lib/X11/XlcDL.c	11 Mar 2003 23:18:49 -0000	1.9.2.1
 @@ -41,7 +41,7 @@
@@ -1436,7 +1436,7 @@
 RCS file: /cvs/xc/lib/X11/XlcPubI.h,v
 retrieving revision 3.9
 retrieving revision 3.9.6.1
-diff -u -u -r3.9 -r3.9.6.1
+diff -u -r3.9 -r3.9.6.1
 --- xc/lib/X11/XlcPubI.h	16 Nov 2001 00:52:27 -0000	3.9
 +++ xc/lib/X11/XlcPubI.h	11 Mar 2003 23:18:49 -0000	3.9.6.1
 @@ -23,7 +23,7 @@
@@ -1461,7 +1461,7 @@
 RCS file: /cvs/xc/lib/X11/imDefIm.c,v
 retrieving revision 1.11
 retrieving revision 1.11.2.1
-diff -u -u -r1.11 -r1.11.2.1
+diff -u -r1.11 -r1.11.2.1
 --- xc/lib/X11/imDefIm.c	14 Dec 2002 01:53:56 -0000	1.11
 +++ xc/lib/X11/imDefIm.c	26 Aug 2003 11:47:17 -0000	1.11.2.1
 @@ -31,7 +31,7 @@
@@ -1486,7 +1486,7 @@
 RCS file: /cvs/xc/lib/X11/lcFile.c,v
 retrieving revision 3.30
 retrieving revision 3.30.2.1
-diff -u -u -r3.30 -r3.30.2.1
+diff -u -r3.30 -r3.30.2.1
 --- xc/lib/X11/lcFile.c	25 Nov 2002 14:04:53 -0000	3.30
 +++ xc/lib/X11/lcFile.c	11 Mar 2003 23:18:49 -0000	3.30.2.1
 @@ -23,7 +23,7 @@
@@ -1534,7 +1534,7 @@
 RCS file: /cvs/xc/lib/font/FreeType/fttools.c,v
 retrieving revision 1.4
 retrieving revision 1.4.2.1
-diff -u -u -r1.4 -r1.4.2.1
+diff -u -r1.4 -r1.4.2.1
 --- xc/lib/font/FreeType/fttools.c	25 Feb 2003 21:36:54 -0000	1.4
 +++ xc/lib/font/FreeType/fttools.c	8 Jun 2003 18:38:55 -0000	1.4.2.1
 @@ -21,7 +21,7 @@
@@ -1571,7 +1571,7 @@
 RCS file: /cvs/xc/lib/font/fc/fsconvert.c,v
 retrieving revision 1.11
 retrieving revision 1.11.2.3
-diff -u -u -r1.11 -r1.11.2.3
+diff -u -r1.11 -r1.11.2.3
 --- xc/lib/font/fc/fsconvert.c	10 Sep 2002 16:14:35 -0000	1.11
 +++ xc/lib/font/fc/fsconvert.c	1 Sep 2003 21:05:37 -0000	1.11.2.3
 @@ -22,7 +22,7 @@
@@ -1607,7 +1607,7 @@
 RCS file: /cvs/xc/lib/font/fc/fserve.c,v
 retrieving revision 3.22
 retrieving revision 3.22.2.1
-diff -u -u -r3.22 -r3.22.2.1
+diff -u -r3.22 -r3.22.2.1
 --- xc/lib/font/fc/fserve.c	31 May 2002 18:45:49 -0000	3.22
 +++ xc/lib/font/fc/fserve.c	29 Aug 2003 18:05:09 -0000	3.22.2.1
 @@ -24,7 +24,7 @@
@@ -1635,7 +1635,7 @@
 RCS file: /cvs/xc/lib/font/fc/fslibos.h,v
 retrieving revision 3.7
 retrieving revision 3.7.2.2
-diff -u -u -r3.7 -r3.7.2.2
+diff -u -r3.7 -r3.7.2.2
 --- xc/lib/font/fc/fslibos.h	31 May 2002 18:45:49 -0000	3.7
 +++ xc/lib/font/fc/fslibos.h	1 Sep 2003 21:05:37 -0000	3.7.2.2
 @@ -31,7 +31,7 @@
@@ -1679,7 +1679,7 @@
 RCS file: /cvs/xc/lib/font/fontfile/fontdir.c,v
 retrieving revision 3.19
 retrieving revision 3.19.2.1
-diff -u -u -r3.19 -r3.19.2.1
+diff -u -r3.19 -r3.19.2.1
 --- xc/lib/font/fontfile/fontdir.c	31 May 2002 18:45:50 -0000	3.19
 +++ xc/lib/font/fontfile/fontdir.c	8 Jun 2003 18:38:55 -0000	3.19.2.1
 @@ -25,7 +25,7 @@
@@ -1730,7 +1730,7 @@
 RCS file: /cvs/xc/programs/Xserver/Xext/Imakefile,v
 retrieving revision 3.42
 retrieving revision 3.42.2.1
-diff -u -u -r3.42 -r3.42.2.1
+diff -u -r3.42 -r3.42.2.1
 --- xc/programs/Xserver/Xext/Imakefile	6 Mar 2002 21:12:32 -0000	3.42
 +++ xc/programs/Xserver/Xext/Imakefile	24 May 2003 22:22:05 -0000	3.42.2.1
 @@ -3,7 +3,7 @@
@@ -1752,7 +1752,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/darwin/Imakefile,v
 retrieving revision 1.15
 retrieving revision 1.15.2.2
-diff -u -u -r1.15 -r1.15.2.2
+diff -u -r1.15 -r1.15.2.2
 --- xc/programs/Xserver/hw/darwin/Imakefile	12 Oct 2002 00:32:43 -0000	1.15
 +++ xc/programs/Xserver/hw/darwin/Imakefile	4 Mar 2003 02:48:04 -0000	1.15.2.2
 @@ -1,4 +1,4 @@
@@ -1797,7 +1797,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/darwin/darwinClut8.h,v
 retrieving revision 1.1
 retrieving revision 1.1.8.1
-diff -u -u -r1.1 -r1.1.8.1
+diff -u -r1.1 -r1.1.8.1
 --- xc/programs/Xserver/hw/darwin/darwinClut8.h	12 Apr 2001 20:09:53 -0000	1.1
 +++ xc/programs/Xserver/hw/darwin/darwinClut8.h	4 Mar 2003 01:31:43 -0000	1.1.8.1
 @@ -1 +1,532 @@
@@ -2340,7 +2340,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/darwin/quartz/Attic/fullscreen.c,v
 retrieving revision 1.3
 retrieving revision 1.3.2.1
-diff -u -u -r1.3 -r1.3.2.1
+diff -u -r1.3 -r1.3.2.1
 --- xc/programs/Xserver/hw/darwin/quartz/fullscreen.c	10 Dec 2002 00:00:39 -0000	1.3
 +++ xc/programs/Xserver/hw/darwin/quartz/fullscreen.c	13 Aug 2003 19:45:28 -0000	1.3.2.1
 @@ -26,7 +26,7 @@
@@ -2367,7 +2367,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj,v
 retrieving revision 1.11
 retrieving revision 1.11.2.1
-diff -u -u -r1.11 -r1.11.2.1
+diff -u -r1.11 -r1.11.2.1
 --- xc/programs/Xserver/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj	29 Jan 2003 01:11:06 -0000	1.11
 +++ xc/programs/Xserver/hw/darwin/quartz/XDarwin.pbproj/project.pbxproj	28 Feb 2003 01:36:09 -0000	1.11.2.1
 @@ -371,7 +371,7 @@
@@ -2393,7 +2393,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/CHANGELOG,v
 retrieving revision 3.2588
 retrieving revision 3.2588.2.28
-diff -u -u -r3.2588 -r3.2588.2.28
+diff -u -r3.2588 -r3.2588.2.28
 --- xc/programs/Xserver/hw/xfree86/CHANGELOG	27 Feb 2003 04:56:44 -0000	3.2588
 +++ xc/programs/Xserver/hw/xfree86/CHANGELOG	17 Sep 2003 05:58:12 -0000	3.2588.2.28
 @@ -1,3 +1,91 @@
@@ -2504,7 +2504,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xf86Date.h,v
 retrieving revision 1.3
 retrieving revision 1.3.2.4
-diff -u -u -r1.3 -r1.3.2.4
+diff -u -r1.3 -r1.3.2.4
 --- xc/programs/Xserver/hw/xfree86/xf86Date.h	27 Feb 2003 04:56:45 -0000	1.3
 +++ xc/programs/Xserver/hw/xfree86/xf86Date.h	16 Aug 2003 01:13:58 -0000	1.3.2.4
 @@ -1,7 +1,7 @@
@@ -2522,7 +2522,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xf86Version.h,v
 retrieving revision 3.543
 retrieving revision 3.543.2.1
-diff -u -u -r3.543 -r3.543.2.1
+diff -u -r3.543 -r3.543.2.1
 --- xc/programs/Xserver/hw/xfree86/xf86Version.h	27 Feb 2003 04:56:45 -0000	3.543
 +++ xc/programs/Xserver/hw/xfree86/xf86Version.h	10 May 2003 01:10:10 -0000	3.543.2.1
 @@ -1,11 +1,11 @@
@@ -2544,7 +2544,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/Imakefile,v
 retrieving revision 3.148
 retrieving revision 3.148.2.1
-diff -u -u -r3.148 -r3.148.2.1
+diff -u -r3.148 -r3.148.2.1
 --- xc/programs/Xserver/hw/xfree86/common/Imakefile	17 Feb 2003 17:06:41 -0000	3.148
 +++ xc/programs/Xserver/hw/xfree86/common/Imakefile	24 May 2003 22:22:09 -0000	3.148.2.1
 @@ -4,7 +4,7 @@
@@ -2567,7 +2567,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v
 retrieving revision 1.63
 retrieving revision 1.63.2.1
-diff -u -u -r1.63 -r1.63.2.1
+diff -u -r1.63 -r1.63.2.1
 --- xc/programs/Xserver/hw/xfree86/common/xf86Mode.c	22 Jan 2003 21:44:09 -0000	1.63
 +++ xc/programs/Xserver/hw/xfree86/common/xf86Mode.c	8 Apr 2003 20:51:27 -0000	1.63.2.1
 @@ -1,4 +1,4 @@
@@ -2616,7 +2616,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v
 retrieving revision 3.68
 retrieving revision 3.68.2.1
-diff -u -u -r3.68 -r3.68.2.1
+diff -u -r3.68 -r3.68.2.1
 --- xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c	18 Feb 2003 15:42:11 -0000	3.68
 +++ xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c	6 May 2003 17:00:43 -0000	3.68.2.1
 @@ -1,4 +1,4 @@
@@ -2650,7 +2650,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile,v
 retrieving revision 1.45
 retrieving revision 1.45.2.1
-diff -u -u -r1.45 -r1.45.2.1
+diff -u -r1.45 -r1.45.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile	17 Feb 2003 17:06:41 -0000	1.45
 +++ xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile	24 May 2003 22:22:10 -0000	1.45.2.1
 @@ -1,4 +1,4 @@
@@ -2688,7 +2688,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c,v
 retrieving revision 1.23
 retrieving revision 1.23.2.1
-diff -u -u -r1.23 -r1.23.2.1
+diff -u -r1.23 -r1.23.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c	24 Feb 2003 20:34:55 -0000	1.23
 +++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_cursor.c	20 May 2003 23:21:27 -0000	1.23.2.1
 @@ -1,4 +1,4 @@
@@ -2711,7 +2711,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c,v
 retrieving revision 1.32
 retrieving revision 1.32.2.1
-diff -u -u -r1.32 -r1.32.2.1
+diff -u -r1.32 -r1.32.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c	19 Feb 2003 09:17:30 -0000	1.32
 +++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c	6 May 2003 23:21:38 -0000	1.32.2.1
 @@ -1,4 +1,4 @@
@@ -2733,7 +2733,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v
 retrieving revision 1.91
 retrieving revision 1.91.2.1
-diff -u -u -r1.91 -r1.91.2.1
+diff -u -r1.91 -r1.91.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c	25 Feb 2003 03:50:15 -0000	1.91
 +++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c	14 Jul 2003 23:57:07 -0000	1.91.2.1
 @@ -1,4 +1,4 @@
@@ -2764,7 +2764,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h,v
 retrieving revision 1.25
 retrieving revision 1.25.2.1
-diff -u -u -r1.25 -r1.25.2.1
+diff -u -r1.25 -r1.25.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h	7 Feb 2003 18:08:59 -0000	1.25
 +++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h	7 Mar 2003 12:13:59 -0000	1.25.2.1
 @@ -1,4 +1,4 @@
@@ -2787,7 +2787,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile,v
 retrieving revision 1.8
 retrieving revision 1.8.2.1
-diff -u -u -r1.8 -r1.8.2.1
+diff -u -r1.8 -r1.8.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile	17 Feb 2003 17:06:42 -0000	1.8
 +++ xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile	24 May 2003 22:22:11 -0000	1.8.2.1
 @@ -1,4 +1,4 @@
@@ -2809,7 +2809,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_video.c,v
 retrieving revision 1.11
 retrieving revision 1.11.2.1
-diff -u -u -r1.11 -r1.11.2.1
+diff -u -r1.11 -r1.11.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_video.c	22 May 2002 08:12:02 -0000	1.11
 +++ xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_video.c	9 May 2003 02:10:18 -0000	1.11.2.1
 @@ -22,7 +22,7 @@
@@ -2837,7 +2837,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i740/Imakefile,v
 retrieving revision 1.10
 retrieving revision 1.10.2.1
-diff -u -u -r1.10 -r1.10.2.1
+diff -u -r1.10 -r1.10.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/i740/Imakefile	17 Feb 2003 17:06:42 -0000	1.10
 +++ xc/programs/Xserver/hw/xfree86/drivers/i740/Imakefile	24 May 2003 22:22:11 -0000	1.10.2.1
 @@ -1,4 +1,4 @@
@@ -2862,7 +2862,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c,v
 retrieving revision 1.33
 retrieving revision 1.33.2.1
-diff -u -u -r1.33 -r1.33.2.1
+diff -u -r1.33 -r1.33.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c	10 Dec 2002 01:27:04 -0000	1.33
 +++ xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.c	22 May 2003 17:58:55 -0000	1.33.2.1
 @@ -1,4 +1,4 @@
@@ -2889,7 +2889,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile,v
 retrieving revision 1.46
 retrieving revision 1.46.2.1
-diff -u -u -r1.46 -r1.46.2.1
+diff -u -r1.46 -r1.46.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile	17 Feb 2003 17:06:42 -0000	1.46
 +++ xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile	24 May 2003 22:22:11 -0000	1.46.2.1
 @@ -1,4 +1,4 @@
@@ -2933,7 +2933,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile,v
 retrieving revision 1.13
 retrieving revision 1.13.2.1
-diff -u -u -r1.13 -r1.13.2.1
+diff -u -r1.13 -r1.13.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile	17 Feb 2003 17:06:43 -0000	1.13
 +++ xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile	24 May 2003 22:22:12 -0000	1.13.2.1
 @@ -1,4 +1,4 @@
@@ -2955,7 +2955,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/newport/Imakefile,v
 retrieving revision 1.5
 retrieving revision 1.5.2.1
-diff -u -u -r1.5 -r1.5.2.1
+diff -u -r1.5 -r1.5.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/newport/Imakefile	10 Dec 2002 04:03:00 -0000	1.5
 +++ xc/programs/Xserver/hw/xfree86/drivers/newport/Imakefile	24 May 2003 22:22:12 -0000	1.5.2.1
 @@ -1,4 +1,4 @@
@@ -2988,7 +2988,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/nsc/Imakefile,v
 retrieving revision 1.6
 retrieving revision 1.6.2.1
-diff -u -u -r1.6 -r1.6.2.1
+diff -u -r1.6 -r1.6.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/nsc/Imakefile	19 Feb 2003 10:10:49 -0000	1.6
 +++ xc/programs/Xserver/hw/xfree86/drivers/nsc/Imakefile	24 May 2003 22:22:13 -0000	1.6.2.1
 @@ -1,4 +1,4 @@
@@ -3044,7 +3044,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v
 retrieving revision 1.27
 retrieving revision 1.27.2.1
-diff -u -u -r1.27 -r1.27.2.1
+diff -u -r1.27 -r1.27.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c	10 Feb 2003 23:42:51 -0000	1.27
 +++ xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c	9 May 2003 02:17:49 -0000	1.27.2.1
 @@ -24,7 +24,7 @@
@@ -3079,7 +3079,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/s3/Imakefile,v
 retrieving revision 1.10
 retrieving revision 1.10.2.1
-diff -u -u -r1.10 -r1.10.2.1
+diff -u -r1.10 -r1.10.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/s3/Imakefile	17 Feb 2003 17:06:43 -0000	1.10
 +++ xc/programs/Xserver/hw/xfree86/drivers/s3/Imakefile	24 May 2003 22:22:13 -0000	1.10.2.1
 @@ -1,4 +1,4 @@
@@ -3106,7 +3106,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile,v
 retrieving revision 1.21
 retrieving revision 1.21.2.1
-diff -u -u -r1.21 -r1.21.2.1
+diff -u -r1.21 -r1.21.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile	17 Feb 2003 17:06:43 -0000	1.21
 +++ xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile	24 May 2003 22:22:14 -0000	1.21.2.1
 @@ -1,4 +1,4 @@
@@ -3127,7 +3127,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c,v
 retrieving revision 1.86
 retrieving revision 1.86.2.1
-diff -u -u -r1.86 -r1.86.2.1
+diff -u -r1.86 -r1.86.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c	4 Feb 2003 02:20:50 -0000	1.86
 +++ xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c	1 Jun 2003 22:13:00 -0000	1.86.2.1
 @@ -1,4 +1,4 @@
@@ -3169,7 +3169,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c,v
 retrieving revision 1.34
 retrieving revision 1.34.2.1
-diff -u -u -r1.34 -r1.34.2.1
+diff -u -r1.34 -r1.34.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c	25 Feb 2003 04:08:21 -0000	1.34
 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c	16 May 2003 14:50:12 -0000	1.34.2.1
 @@ -1,4 +1,4 @@
@@ -3203,7 +3203,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c,v
 retrieving revision 1.28
 retrieving revision 1.28.2.1
-diff -u -u -r1.28 -r1.28.2.1
+diff -u -r1.28 -r1.28.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c	5 Feb 2003 17:45:29 -0000	1.28
 +++ xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c	9 May 2003 02:22:00 -0000	1.28.2.1
 @@ -26,7 +26,7 @@
@@ -3247,7 +3247,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c,v
 retrieving revision 1.9
 retrieving revision 1.9.2.1
-diff -u -u -r1.9 -r1.9.2.1
+diff -u -r1.9 -r1.9.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c	12 Jan 2003 03:55:49 -0000	1.9
 +++ xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c	9 May 2003 02:22:00 -0000	1.9.2.1
 @@ -41,7 +41,7 @@
@@ -3273,7 +3273,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile,v
 retrieving revision 1.31
 retrieving revision 1.31.2.1
-diff -u -u -r1.31 -r1.31.2.1
+diff -u -r1.31 -r1.31.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile	17 Feb 2003 17:06:44 -0000	1.31
 +++ xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile	24 May 2003 22:22:14 -0000	1.31.2.1
 @@ -1,4 +1,4 @@
@@ -3304,7 +3304,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/trident/Imakefile,v
 retrieving revision 1.31
 retrieving revision 1.31.2.1
-diff -u -u -r1.31 -r1.31.2.1
+diff -u -r1.31 -r1.31.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/trident/Imakefile	17 Feb 2003 17:06:44 -0000	1.31
 +++ xc/programs/Xserver/hw/xfree86/drivers/trident/Imakefile	24 May 2003 22:22:14 -0000	1.31.2.1
 @@ -1,4 +1,4 @@
@@ -3325,7 +3325,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/vesa/Imakefile,v
 retrieving revision 1.6
 retrieving revision 1.6.2.1
-diff -u -u -r1.6 -r1.6.2.1
+diff -u -r1.6 -r1.6.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/vesa/Imakefile	17 Feb 2003 17:06:44 -0000	1.6
 +++ xc/programs/Xserver/hw/xfree86/drivers/vesa/Imakefile	24 May 2003 22:22:15 -0000	1.6.2.1
 @@ -1,4 +1,4 @@
@@ -3347,7 +3347,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/drivers/vmware/Imakefile,v
 retrieving revision 1.6
 retrieving revision 1.6.2.1
-diff -u -u -r1.6 -r1.6.2.1
+diff -u -r1.6 -r1.6.2.1
 --- xc/programs/Xserver/hw/xfree86/drivers/vmware/Imakefile	17 Feb 2003 17:06:45 -0000	1.6
 +++ xc/programs/Xserver/hw/xfree86/drivers/vmware/Imakefile	24 May 2003 22:22:15 -0000	1.6.2.1
 @@ -1,4 +1,4 @@
@@ -3382,7 +3382,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh,v
 retrieving revision 1.48
 retrieving revision 1.48.2.3
-diff -u -u -r1.48 -r1.48.2.3
+diff -u -r1.48 -r1.48.2.3
 --- xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh	24 Feb 2003 04:24:17 -0000	1.48
 +++ xc/programs/Xserver/hw/xfree86/etc/Xinstall.sh	8 Mar 2003 13:46:26 -0000	1.48.2.3
 @@ -1,7 +1,7 @@
@@ -3454,7 +3454,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v
 retrieving revision 1.30
 retrieving revision 1.30.2.1
-diff -u -u -r1.30 -r1.30.2.1
+diff -u -r1.30 -r1.30.2.1
 --- xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c	25 Nov 2002 14:05:00 -0000	1.30
 +++ xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c	26 Aug 2003 12:17:37 -0000	1.30.2.1
 @@ -1,4 +1,4 @@
@@ -3480,7 +3480,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/int10/generic.c,v
 retrieving revision 1.25
 retrieving revision 1.25.2.1
-diff -u -u -r1.25 -r1.25.2.1
+diff -u -r1.25 -r1.25.2.1
 --- xc/programs/Xserver/hw/xfree86/int10/generic.c	4 Apr 2002 14:05:51 -0000	1.25
 +++ xc/programs/Xserver/hw/xfree86/int10/generic.c	20 Mar 2003 15:14:25 -0000	1.25.2.1
 @@ -1,4 +1,4 @@
@@ -3519,7 +3519,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/int10/xf86int10.c,v
 retrieving revision 1.10
 retrieving revision 1.10.2.1
-diff -u -u -r1.10 -r1.10.2.1
+diff -u -r1.10 -r1.10.2.1
 --- xc/programs/Xserver/hw/xfree86/int10/xf86int10.c	25 Nov 2002 14:05:01 -0000	1.10
 +++ xc/programs/Xserver/hw/xfree86/int10/xf86int10.c	21 Mar 2003 22:29:59 -0000	1.10.2.1
 @@ -1,4 +1,4 @@
@@ -3596,7 +3596,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/loader/Imakefile,v
 retrieving revision 1.35
 retrieving revision 1.35.2.1
-diff -u -u -r1.35 -r1.35.2.1
+diff -u -r1.35 -r1.35.2.1
 --- xc/programs/Xserver/hw/xfree86/loader/Imakefile	26 Feb 2003 23:32:12 -0000	1.35
 +++ xc/programs/Xserver/hw/xfree86/loader/Imakefile	13 Mar 2003 04:10:47 -0000	1.35.2.1
 @@ -1,4 +1,4 @@
@@ -3630,7 +3630,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/loader/xf86sym.c,v
 retrieving revision 1.227
 retrieving revision 1.227.2.1
-diff -u -u -r1.227 -r1.227.2.1
+diff -u -r1.227 -r1.227.2.1
 --- xc/programs/Xserver/hw/xfree86/loader/xf86sym.c	26 Feb 2003 20:08:02 -0000	1.227
 +++ xc/programs/Xserver/hw/xfree86/loader/xf86sym.c	13 Mar 2003 04:10:47 -0000	1.227.2.1
 @@ -1,4 +1,4 @@
@@ -3672,7 +3672,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/Imakefile,v
 retrieving revision 3.56
 retrieving revision 3.56.2.1
-diff -u -u -r3.56 -r3.56.2.1
+diff -u -r3.56 -r3.56.2.1
 --- xc/programs/Xserver/hw/xfree86/os-support/Imakefile	17 Feb 2003 17:06:45 -0000	3.56
 +++ xc/programs/Xserver/hw/xfree86/os-support/Imakefile	24 May 2003 22:22:16 -0000	3.56.2.1
 @@ -1,4 +1,4 @@
@@ -3692,7 +3692,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h,v
 retrieving revision 3.49
 retrieving revision 3.49.2.1
-diff -u -u -r3.49 -r3.49.2.1
+diff -u -r3.49 -r3.49.2.1
 --- xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h	22 Feb 2003 06:00:39 -0000	3.49
 +++ xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h	13 Mar 2003 04:10:49 -0000	3.49.2.1
 @@ -22,7 +22,7 @@
@@ -3725,7 +3725,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c,v
 retrieving revision 1.2
 retrieving revision 1.2.2.1
-diff -u -u -r1.2 -r1.2.2.1
+diff -u -r1.2 -r1.2.2.1
 --- xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c	29 Oct 2002 23:19:13 -0000	1.2
 +++ xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c	9 May 2003 02:30:43 -0000	1.2.2.1
 @@ -1,4 +1,4 @@
@@ -3794,7 +3794,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v
 retrieving revision 1.71
 retrieving revision 1.71.2.2
-diff -u -u -r1.71 -r1.71.2.2
+diff -u -r1.71 -r1.71.2.2
 --- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c	23 Jan 2003 16:22:13 -0000	1.71
 +++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c	6 May 2003 17:00:45 -0000	1.71.2.2
 @@ -1,4 +1,4 @@
@@ -3854,7 +3854,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h,v
 retrieving revision 1.36
 retrieving revision 1.36.2.1
-diff -u -u -r1.36 -r1.36.2.1
+diff -u -r1.36 -r1.36.2.1
 --- xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h	23 Dec 2002 15:37:26 -0000	1.36
 +++ xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h	21 Mar 2003 22:29:59 -0000	1.36.2.1
 @@ -1,4 +1,4 @@
@@ -3877,7 +3877,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v
 retrieving revision 1.36
 retrieving revision 1.36.2.1
-diff -u -u -r1.36 -r1.36.2.1
+diff -u -r1.36 -r1.36.2.1
 --- xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h	18 Feb 2003 15:42:12 -0000	1.36
 +++ xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h	21 Mar 2003 22:29:59 -0000	1.36.2.1
 @@ -1,4 +1,4 @@
@@ -3900,7 +3900,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c,v
 retrieving revision 1.88
 retrieving revision 1.88.2.2
-diff -u -u -r1.88 -r1.88.2.2
+diff -u -r1.88 -r1.88.2.2
 --- xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c	22 Feb 2003 06:00:39 -0000	1.88
 +++ xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c	13 Mar 2003 21:49:53 -0000	1.88.2.2
 @@ -1,4 +1,4 @@
@@ -3978,7 +3978,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v
 retrieving revision 1.18
 retrieving revision 1.18.2.1
-diff -u -u -r1.18 -r1.18.2.1
+diff -u -r1.18 -r1.18.2.1
 --- xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c	21 Feb 2003 15:06:19 -0000	1.18
 +++ xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c	15 Apr 2003 20:32:29 -0000	1.18.2.1
 @@ -6,7 +6,7 @@
@@ -4033,7 +4033,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/vbe/Imakefile,v
 retrieving revision 1.1
 retrieving revision 1.1.2.1
-diff -u -u -r1.1 -r1.1.2.1
+diff -u -r1.1 -r1.1.2.1
 --- xc/programs/Xserver/hw/xfree86/vbe/Imakefile	17 Feb 2003 17:06:45 -0000	1.1
 +++ xc/programs/Xserver/hw/xfree86/vbe/Imakefile	24 May 2003 22:22:16 -0000	1.1.2.1
 @@ -1,4 +1,4 @@
@@ -4053,7 +4053,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v
 retrieving revision 1.30
 retrieving revision 1.30.10.1
-diff -u -u -r1.30 -r1.30.10.1
+diff -u -r1.30 -r1.30.10.1
 --- xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c	25 Sep 2000 23:56:14 -0000	1.30
 +++ xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c	16 Aug 2003 01:13:58 -0000	1.30.10.1
 @@ -1,4 +1,4 @@
@@ -4089,7 +4089,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile,v
 retrieving revision 1.22
 retrieving revision 1.22.2.1
-diff -u -u -r1.22 -r1.22.2.1
+diff -u -r1.22 -r1.22.2.1
 --- xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile	26 Feb 2003 20:08:03 -0000	1.22
 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/Imakefile	13 Mar 2003 04:10:50 -0000	1.22.2.1
 @@ -1,4 +1,4 @@
@@ -4120,7 +4120,7 @@
 RCS file: /cvs/xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c,v
 retrieving revision 1.14
 retrieving revision 1.14.2.1
-diff -u -u -r1.14 -r1.14.2.1
+diff -u -r1.14 -r1.14.2.1
 --- xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c	26 Feb 2003 20:08:03 -0000	1.14
 +++ xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c	13 Mar 2003 04:10:50 -0000	1.14.2.1
 @@ -26,15 +26,16 @@
@@ -4164,7 +4164,7 @@
 RCS file: /cvs/xc/programs/Xserver/include/Imakefile,v
 retrieving revision 3.21
 retrieving revision 3.21.8.2
-diff -u -u -r3.21 -r3.21.8.2
+diff -u -r3.21 -r3.21.8.2
 --- xc/programs/Xserver/include/Imakefile	17 Jan 2001 22:36:56 -0000	3.21
 +++ xc/programs/Xserver/include/Imakefile	4 Mar 2003 02:46:18 -0000	3.21.8.2
 @@ -3,7 +3,7 @@
@@ -4181,7 +4181,7 @@
 RCS file: /cvs/xc/programs/Xserver/mi/Imakefile,v
 retrieving revision 3.34
 retrieving revision 3.34.2.1
-diff -u -u -r3.34 -r3.34.2.1
+diff -u -r3.34 -r3.34.2.1
 --- xc/programs/Xserver/mi/Imakefile	22 May 2002 21:38:31 -0000	3.34
 +++ xc/programs/Xserver/mi/Imakefile	24 May 2003 22:22:17 -0000	3.34.2.1
 @@ -3,7 +3,7 @@
@@ -4203,7 +4203,7 @@
 RCS file: /cvs/xc/programs/Xserver/os/access.c,v
 retrieving revision 3.42
 retrieving revision 3.42.2.1
-diff -u -u -r3.42 -r3.42.2.1
+diff -u -r3.42 -r3.42.2.1
 --- xc/programs/Xserver/os/access.c	7 Jul 2002 20:11:52 -0000	3.42
 +++ xc/programs/Xserver/os/access.c	25 May 2003 10:44:39 -0000	3.42.2.1
 @@ -45,7 +45,7 @@
@@ -4228,7 +4228,7 @@
 RCS file: /cvs/xc/programs/Xserver/render/Imakefile,v
 retrieving revision 1.10
 retrieving revision 1.10.2.1
-diff -u -u -r1.10 -r1.10.2.1
+diff -u -r1.10 -r1.10.2.1
 --- xc/programs/Xserver/render/Imakefile	23 Nov 2002 02:38:15 -0000	1.10
 +++ xc/programs/Xserver/render/Imakefile	24 May 2003 22:22:17 -0000	1.10.2.1
 @@ -1,4 +1,4 @@
@@ -4252,7 +4252,7 @@
 RCS file: /cvs/xc/programs/Xserver/xkb/xkbInit.c,v
 retrieving revision 3.26
 retrieving revision 3.26.2.1
-diff -u -u -r3.26 -r3.26.2.1
+diff -u -r3.26 -r3.26.2.1
 --- xc/programs/Xserver/xkb/xkbInit.c	9 Feb 2003 06:29:20 -0000	3.26
 +++ xc/programs/Xserver/xkb/xkbInit.c	17 Mar 2003 23:53:14 -0000	3.26.2.1
 @@ -24,7 +24,7 @@
@@ -4278,7 +4278,7 @@
 RCS file: /cvs/xc/programs/twm/events.c,v
 retrieving revision 1.12
 retrieving revision 1.12.4.1
-diff -u -u -r1.12 -r1.12.4.1
+diff -u -r1.12 -r1.12.4.1
 --- xc/programs/twm/events.c	14 Dec 2001 20:01:06 -0000	1.12
 +++ xc/programs/twm/events.c	12 Jun 2003 06:24:22 -0000	1.12.4.1
 @@ -1,4 +1,4 @@
@@ -4314,7 +4314,7 @@
 RCS file: /cvs/xc/programs/twm/list.c,v
 retrieving revision 1.8
 retrieving revision 1.8.2.1
-diff -u -u -r1.8 -r1.8.2.1
+diff -u -r1.8 -r1.8.2.1
 --- xc/programs/twm/list.c	24 Sep 2002 21:00:27 -0000	1.8
 +++ xc/programs/twm/list.c	12 Jun 2003 06:24:22 -0000	1.8.2.1
 @@ -48,7 +48,7 @@
@@ -4340,7 +4340,7 @@
 RCS file: /cvs/xc/programs/twm/menus.c,v
 retrieving revision 1.16
 retrieving revision 1.16.2.1
-diff -u -u -r1.16 -r1.16.2.1
+diff -u -r1.16 -r1.16.2.1
 --- xc/programs/twm/menus.c	19 Oct 2002 20:04:20 -0000	1.16
 +++ xc/programs/twm/menus.c	12 Jun 2003 06:24:22 -0000	1.16.2.1
 @@ -1,4 +1,4 @@
@@ -4486,7 +4486,7 @@
 RCS file: /cvs/xc/programs/twm/session.c,v
 retrieving revision 3.8
 retrieving revision 3.8.4.1
-diff -u -u -r3.8 -r3.8.4.1
+diff -u -r3.8 -r3.8.4.1
 --- xc/programs/twm/session.c	14 Dec 2001 20:01:10 -0000	3.8
 +++ xc/programs/twm/session.c	12 Jun 2003 06:24:22 -0000	3.8.4.1
 @@ -25,7 +25,7 @@
@@ -4512,7 +4512,7 @@
 RCS file: /cvs/xc/programs/twm/twm.c,v
 retrieving revision 3.12
 retrieving revision 3.12.4.1
-diff -u -u -r3.12 -r3.12.4.1
+diff -u -r3.12 -r3.12.4.1
 --- xc/programs/twm/twm.c	14 Dec 2001 20:01:10 -0000	3.12
 +++ xc/programs/twm/twm.c	12 Jun 2003 06:24:22 -0000	3.12.4.1
 @@ -59,7 +59,7 @@
@@ -4643,7 +4643,7 @@
 RCS file: /cvs/xc/programs/twm/twm.h,v
 retrieving revision 3.12
 retrieving revision 3.12.4.1
-diff -u -u -r3.12 -r3.12.4.1
+diff -u -r3.12 -r3.12.4.1
 --- xc/programs/twm/twm.h	14 Dec 2001 20:01:10 -0000	3.12
 +++ xc/programs/twm/twm.h	12 Jun 2003 06:24:22 -0000	3.12.4.1
 @@ -60,7 +60,7 @@
@@ -4677,7 +4677,7 @@
 RCS file: /cvs/xc/programs/xdm/Imakefile,v
 retrieving revision 3.52
 retrieving revision 3.52.2.1
-diff -u -u -r3.52 -r3.52.2.1
+diff -u -r3.52 -r3.52.2.1
 --- xc/programs/xdm/Imakefile	7 Dec 2002 20:31:04 -0000	3.52
 +++ xc/programs/xdm/Imakefile	17 Sep 2003 05:58:16 -0000	3.52.2.1
 @@ -3,7 +3,7 @@
@@ -4879,7 +4879,7 @@
 RCS file: /cvs/xc/programs/xdm/access.c,v
 retrieving revision 3.10
 retrieving revision 3.10.2.1
-diff -u -u -r3.10 -r3.10.2.1
+diff -u -r3.10 -r3.10.2.1
 --- xc/programs/xdm/access.c	10 Dec 2002 23:36:43 -0000	3.10
 +++ xc/programs/xdm/access.c	17 Sep 2003 05:58:16 -0000	3.10.2.1
 @@ -2,6 +2,7 @@
@@ -5173,7 +5173,7 @@
 RCS file: /cvs/xc/programs/xdm/auth.c,v
 retrieving revision 3.27
 retrieving revision 3.27.2.1
-diff -u -u -r3.27 -r3.27.2.1
+diff -u -r3.27 -r3.27.2.1
 --- xc/programs/xdm/auth.c	10 Dec 2002 22:37:17 -0000	3.27
 +++ xc/programs/xdm/auth.c	17 Sep 2003 05:58:16 -0000	3.27.2.1
 @@ -26,7 +26,7 @@
@@ -5363,7 +5363,7 @@
 RCS file: /cvs/xc/programs/xdm/choose.c,v
 retrieving revision 3.15
 retrieving revision 3.15.4.1
-diff -u -u -r3.15 -r3.15.4.1
+diff -u -r3.15 -r3.15.4.1
 --- xc/programs/xdm/choose.c	14 Dec 2001 20:01:20 -0000	3.15
 +++ xc/programs/xdm/choose.c	17 Sep 2003 05:58:16 -0000	3.15.4.1
 @@ -26,7 +26,7 @@
@@ -5428,7 +5428,7 @@
 RCS file: /cvs/xc/programs/xdm/chooser.c,v
 retrieving revision 3.24
 retrieving revision 3.24.4.1
-diff -u -u -r3.24 -r3.24.4.1
+diff -u -r3.24 -r3.24.4.1
 --- xc/programs/xdm/chooser.c	14 Dec 2001 20:01:20 -0000	3.24
 +++ xc/programs/xdm/chooser.c	17 Sep 2003 05:58:16 -0000	3.24.4.1
 @@ -26,7 +26,7 @@
@@ -5561,7 +5561,7 @@
 RCS file: /cvs/xc/programs/xdm/dm.c,v
 retrieving revision 3.21
 retrieving revision 3.21.2.1
-diff -u -u -r3.21 -r3.21.2.1
+diff -u -r3.21 -r3.21.2.1
 --- xc/programs/xdm/dm.c	7 Dec 2002 20:31:04 -0000	3.21
 +++ xc/programs/xdm/dm.c	17 Sep 2003 05:58:16 -0000	3.21.2.1
 @@ -26,7 +26,7 @@
@@ -5647,7 +5647,7 @@
 RCS file: /cvs/xc/programs/xdm/dm.h,v
 retrieving revision 3.29
 retrieving revision 3.29.2.1
-diff -u -u -r3.29 -r3.29.2.1
+diff -u -r3.29 -r3.29.2.1
 --- xc/programs/xdm/dm.h	31 May 2002 18:46:10 -0000	3.29
 +++ xc/programs/xdm/dm.h	17 Sep 2003 05:58:16 -0000	3.29.2.1
 @@ -26,7 +26,7 @@
@@ -5758,7 +5758,7 @@
 RCS file: /cvs/xc/programs/xdm/dm_auth.h,v
 retrieving revision 1.2
 retrieving revision 1.2.10.1
-diff -u -u -r1.2 -r1.2.10.1
+diff -u -r1.2 -r1.2.10.1
 --- xc/programs/xdm/dm_auth.h	31 May 2000 07:15:11 -0000	1.2
 +++ xc/programs/xdm/dm_auth.h	17 Sep 2003 05:58:16 -0000	1.2.10.1
 @@ -1,5 +1,5 @@
@@ -5789,7 +5789,7 @@
 RCS file: /cvs/xc/programs/xdm/dpylist.c,v
 retrieving revision 1.5
 retrieving revision 1.5.4.1
-diff -u -u -r1.5 -r1.5.4.1
+diff -u -r1.5 -r1.5.4.1
 --- xc/programs/xdm/dpylist.c	14 Dec 2001 20:01:21 -0000	1.5
 +++ xc/programs/xdm/dpylist.c	17 Sep 2003 05:58:16 -0000	1.5.4.1
 @@ -26,7 +26,7 @@
@@ -5814,7 +5814,7 @@
 RCS file: /cvs/xc/programs/xdm/genauth.c,v
 retrieving revision 3.15
 retrieving revision 3.15.2.1
-diff -u -u -r3.15 -r3.15.2.1
+diff -u -r3.15 -r3.15.2.1
 --- xc/programs/xdm/genauth.c	6 Oct 2002 18:12:29 -0000	3.15
 +++ xc/programs/xdm/genauth.c	17 Sep 2003 05:58:16 -0000	3.15.2.1
 @@ -26,7 +26,7 @@
@@ -6392,7 +6392,7 @@
 RCS file: /cvs/xc/programs/xdm/greet.h,v
 retrieving revision 1.8
 retrieving revision 1.8.4.1
-diff -u -u -r1.8 -r1.8.4.1
+diff -u -r1.8 -r1.8.4.1
 --- xc/programs/xdm/greet.h	14 Dec 2001 20:01:22 -0000	1.8
 +++ xc/programs/xdm/greet.h	17 Sep 2003 05:58:16 -0000	1.8.4.1
 @@ -26,7 +26,7 @@
@@ -6418,7 +6418,7 @@
 RCS file: /cvs/xc/programs/xdm/mitauth.c,v
 retrieving revision 1.4
 retrieving revision 1.4.4.1
-diff -u -u -r1.4 -r1.4.4.1
+diff -u -r1.4 -r1.4.4.1
 --- xc/programs/xdm/mitauth.c	14 Dec 2001 20:01:22 -0000	1.4
 +++ xc/programs/xdm/mitauth.c	17 Sep 2003 05:58:16 -0000	1.4.4.1
 @@ -26,7 +26,7 @@
@@ -6465,7 +6465,7 @@
 RCS file: /cvs/xc/programs/xdm/netaddr.c,v
 retrieving revision 3.6
 retrieving revision 3.6.4.1
-diff -u -u -r3.6 -r3.6.4.1
+diff -u -r3.6 -r3.6.4.1
 --- xc/programs/xdm/netaddr.c	14 Dec 2001 20:01:22 -0000	3.6
 +++ xc/programs/xdm/netaddr.c	17 Sep 2003 05:58:16 -0000	3.6.4.1
 @@ -26,7 +26,7 @@
@@ -6687,7 +6687,7 @@
 RCS file: /cvs/xc/programs/xdm/resource.c,v
 retrieving revision 3.10
 retrieving revision 3.10.2.1
-diff -u -u -r3.10 -r3.10.2.1
+diff -u -r3.10 -r3.10.2.1
 --- xc/programs/xdm/resource.c	7 Dec 2002 20:31:04 -0000	3.10
 +++ xc/programs/xdm/resource.c	17 Sep 2003 05:58:16 -0000	3.10.2.1
 @@ -26,7 +26,7 @@
@@ -6829,7 +6829,7 @@
 RCS file: /cvs/xc/programs/xdm/server.c,v
 retrieving revision 3.13
 retrieving revision 3.13.4.1
-diff -u -u -r3.13 -r3.13.4.1
+diff -u -r3.13 -r3.13.4.1
 --- xc/programs/xdm/server.c	14 Dec 2001 20:01:23 -0000	3.13
 +++ xc/programs/xdm/server.c	17 Sep 2003 05:58:16 -0000	3.13.4.1
 @@ -26,7 +26,7 @@
@@ -6876,7 +6876,7 @@
 RCS file: /cvs/xc/programs/xdm/session.c,v
 retrieving revision 3.33
 retrieving revision 3.33.4.1
-diff -u -u -r3.33 -r3.33.4.1
+diff -u -r3.33 -r3.33.4.1
 --- xc/programs/xdm/session.c	14 Dec 2001 20:01:23 -0000	3.33
 +++ xc/programs/xdm/session.c	17 Sep 2003 05:58:16 -0000	3.33.4.1
 @@ -26,7 +26,7 @@
@@ -6959,7 +6959,7 @@
 RCS file: /cvs/xc/programs/xdm/socket.c,v
 retrieving revision 3.10
 retrieving revision 3.10.4.1
-diff -u -u -r3.10 -r3.10.4.1
+diff -u -r3.10 -r3.10.4.1
 --- xc/programs/xdm/socket.c	14 Dec 2001 20:01:24 -0000	3.10
 +++ xc/programs/xdm/socket.c	17 Sep 2003 05:58:16 -0000	3.10.4.1
 @@ -2,6 +2,7 @@
@@ -7374,7 +7374,7 @@
 RCS file: /cvs/xc/programs/xdm/streams.c,v
 retrieving revision 3.6
 retrieving revision 3.6.4.1
-diff -u -u -r3.6 -r3.6.4.1
+diff -u -r3.6 -r3.6.4.1
 --- xc/programs/xdm/streams.c	14 Dec 2001 20:01:24 -0000	3.6
 +++ xc/programs/xdm/streams.c	17 Sep 2003 05:58:17 -0000	3.6.4.1
 @@ -26,7 +26,7 @@
@@ -7417,7 +7417,7 @@
 RCS file: /cvs/xc/programs/xdm/xdm.man,v
 retrieving revision 3.22
 retrieving revision 3.22.2.1
-diff -u -u -r3.22 -r3.22.2.1
+diff -u -r3.22 -r3.22.2.1
 --- xc/programs/xdm/xdm.man	12 Oct 2002 16:06:47 -0000	3.22
 +++ xc/programs/xdm/xdm.man	17 Sep 2003 05:58:17 -0000	3.22.2.1
 @@ -23,7 +23,7 @@
@@ -7618,7 +7618,7 @@
 RCS file: /cvs/xc/programs/xdm/xdmauth.c,v
 retrieving revision 1.5
 retrieving revision 1.5.4.1
-diff -u -u -r1.5 -r1.5.4.1
+diff -u -r1.5 -r1.5.4.1
 --- xc/programs/xdm/xdmauth.c	14 Dec 2001 20:01:25 -0000	1.5
 +++ xc/programs/xdm/xdmauth.c	17 Sep 2003 05:58:17 -0000	1.5.4.1
 @@ -26,7 +26,7 @@
@@ -7650,7 +7650,7 @@
 RCS file: /cvs/xc/programs/xdm/xdmcp.c,v
 retrieving revision 3.21
 retrieving revision 3.21.2.1
-diff -u -u -r3.21 -r3.21.2.1
+diff -u -r3.21 -r3.21.2.1
 --- xc/programs/xdm/xdmcp.c	10 Dec 2002 22:37:17 -0000	3.21
 +++ xc/programs/xdm/xdmcp.c	17 Sep 2003 05:58:17 -0000	3.21.2.1
 @@ -26,7 +26,7 @@
@@ -8244,7 +8244,7 @@
 RCS file: /cvs/xc/programs/xdm/config/Xaccess,v
 retrieving revision 1.3
 retrieving revision 1.3.8.1
-diff -u -u -r1.3 -r1.3.8.1
+diff -u -r1.3 -r1.3.8.1
 --- xc/programs/xdm/config/Xaccess	17 Jan 2001 23:45:24 -0000	1.3
 +++ xc/programs/xdm/config/Xaccess	17 Sep 2003 05:58:18 -0000	1.3.8.1
 @@ -1,6 +1,5 @@
@@ -8299,7 +8299,7 @@
 RCS file: /cvs/xc/programs/xdm/greeter/Imakefile,v
 retrieving revision 1.7
 retrieving revision 1.7.2.1
-diff -u -u -r1.7 -r1.7.2.1
+diff -u -r1.7 -r1.7.2.1
 --- xc/programs/xdm/greeter/Imakefile	30 Nov 2002 18:59:35 -0000	1.7
 +++ xc/programs/xdm/greeter/Imakefile	17 Sep 2003 05:58:18 -0000	1.7.2.1
 @@ -3,7 +3,7 @@
@@ -8339,7 +8339,7 @@
 RCS file: /cvs/xc/programs/xdm/greeter/Login.c,v
 retrieving revision 3.16
 retrieving revision 3.16.2.1
-diff -u -u -r3.16 -r3.16.2.1
+diff -u -r3.16 -r3.16.2.1
 --- xc/programs/xdm/greeter/Login.c	6 Oct 2002 20:42:16 -0000	3.16
 +++ xc/programs/xdm/greeter/Login.c	17 Sep 2003 05:58:18 -0000	3.16.2.1
 @@ -26,7 +26,7 @@
@@ -8378,7 +8378,7 @@
 RCS file: /cvs/xc/programs/xdm/greeter/greet.c,v
 retrieving revision 3.16
 retrieving revision 3.16.2.1
-diff -u -u -r3.16 -r3.16.2.1
+diff -u -r3.16 -r3.16.2.1
 --- xc/programs/xdm/greeter/greet.c	6 Oct 2002 20:42:16 -0000	3.16
 +++ xc/programs/xdm/greeter/greet.c	17 Sep 2003 05:58:18 -0000	3.16.2.1
 @@ -26,7 +26,7 @@
@@ -8443,7 +8443,7 @@
 RCS file: /cvs/xc/programs/xdm/greeter/verify.c,v
 retrieving revision 3.24
 retrieving revision 3.24.2.1
-diff -u -u -r3.24 -r3.24.2.1
+diff -u -r3.24 -r3.24.2.1
 --- xc/programs/xdm/greeter/verify.c	26 Nov 2002 01:16:09 -0000	3.24
 +++ xc/programs/xdm/greeter/verify.c	17 Sep 2003 05:58:18 -0000	3.24.2.1
 @@ -26,7 +26,7 @@



Reply to: