[Xorg-commit] xc/lib/GL/mesa/src/drv/mga mgaioctl.h,1.1.4.2,1.1.4.3
Kaleb Keithley
xserver-commit at pdx.freedesktop.org
Sat Dec 6 19:35:54 EET 2003
Committed by: kaleb
Update of /cvs/xorg/xc/lib/GL/mesa/src/drv/mga
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/lib/GL/mesa/src/drv/mga
Modified Files:
Tag: XORG-CURRENT
mgaioctl.h
Log Message:
fix bad merge
Index: mgaioctl.h
===================================================================
RCS file: /cvs/xorg/xc/lib/GL/mesa/src/drv/mga/mgaioctl.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- mgaioctl.h 6 Dec 2003 13:22:43 -0000 1.1.4.2
+++ mgaioctl.h 6 Dec 2003 17:35:52 -0000 1.1.4.3
@@ -26,7 +26,7 @@
* Gareth Hughes <gareth at valinux.com>
*/
/* $XFree86: xc/lib/GL/mesa/src/drv/mga/mgaioctl.h,v 1.13 2003/12/02 13:02:38 alanh Exp $ */
-/* $XdotOrg$ *?
+/* $XdotOrg$ */
#ifndef MGA_IOCTL_H
#define MGA_IOCTL_H
More information about the xorg-commit
mailing list