summaryrefslogtreecommitdiff
path: root/src/riva_dga.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:40:29 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:40:29 +0000
commit6f939db2b40f27be48e000ddef0d851724f7991b (patch)
tree43afd0a2261c274470ef49c4379927d16e2bd5d7 /src/riva_dga.c
parenta13885d1155c944863c8c17f054105edde568330 (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
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/riva_dga.c')
-rw-r--r--src/riva_dga.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/riva_dga.c b/src/riva_dga.c
index cbe4224..6e5afd8 100644
--- a/src/riva_dga.c
+++ b/src/riva_dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/riva_dga.c,v 1.1 2003/07/31 20:24:29 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/riva/riva_dga.c $ */
#include "riva_local.h"
#include "riva_include.h"