summaryrefslogtreecommitdiff
path: root/src/nv_video.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:47:49 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:47:49 +0000
commit76499605ae964f17633b8f7c36edb6562ca7d7ff (patch)
tree43afd0a2261c274470ef49c4379927d16e2bd5d7 /src/nv_video.c
parenta13885d1155c944863c8c17f054105edde568330 (diff)
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
a changed license. There was only one change which happened to be from me (Egbert Eich).
Diffstat (limited to 'src/nv_video.c')
-rw-r--r--src/nv_video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nv_video.c b/src/nv_video.c
index 3b2eb5b..66f49c0 100644
--- a/src/nv_video.c
+++ b/src/nv_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c,v 1.21 2003/11/10 18:22:24 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_video.c,v 1.20tsi Exp $ */
#include "xf86.h"
#include "xf86_OSproc.h"