summaryrefslogtreecommitdiff
path: root/src/i830_dga.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:40:24 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:40:24 +0000
commit7d27a815b614d93698b6d3de4c8a102e35d9fe99 (patch)
tree44a767546075981208dcfb359d73ea27c073a7fd /src/i830_dga.c
parent71687eeaa94c5b1ce1fbb11ff27d4e69c73a4a1d (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infectedXACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
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).
Diffstat (limited to 'src/i830_dga.c')
-rw-r--r--src/i830_dga.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/i830_dga.c b/src/i830_dga.c
index bb4c103a..8bd570c6 100644
--- a/src/i830_dga.c
+++ b/src/i830_dga.c
@@ -34,7 +34,7 @@
* with <TAB> characters expanded at 8-column intervals.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dga.c,v 1.3 2003/02/26 04:11:23 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dga.c,v 1.2 2002/11/05 02:01:18 dawes Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"