[Xorg-commit] xc/programs/Xserver/Xext xf86vmode.c,1.1.4.2,1.1.4.3 xtest1di.c,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/Xext
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/Xext

Modified Files:
      Tag: XORG-CURRENT
	xf86vmode.c xtest1di.c 
Log Message:
merge XFree86 4.3.99.901 (RC1) from vendor branch

Index: xf86vmode.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xf86vmode.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- xf86vmode.c	26 Nov 2003 22:48:41 -0000	1.1.4.2
+++ xf86vmode.c	6 Dec 2003 13:24:23 -0000	1.1.4.3
@@ -29,6 +29,7 @@
 from Kaleb S. KEITHLEY
 
 */
+/* $XdotOrg$ */
 /* $Xorg: xf86vmode.c,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ */
 /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
 
@@ -114,7 +115,6 @@
 static unsigned char XF86VidModeReqCode = 0;
 #endif
 
-
 /* The XF86VIDMODE_EVENTS code is far from complete */
 
 #ifdef XF86VIDMODE_EVENTS

Index: xtest1di.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xtest1di.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- xtest1di.c	26 Nov 2003 22:48:41 -0000	1.1.4.2
+++ xtest1di.c	6 Dec 2003 13:24:23 -0000	1.1.4.3
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $Xorg: xtest1di.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
 /*
  *	File:  xtest1di.c
@@ -76,8 +77,6 @@
 
 #include "xtest1dd.h"
 
-#include "xtest1dd.h"
-
 /*****************************************************************************
  * defines
  ****************************************************************************/