From 6f939db2b40f27be48e000ddef0d851724f7991b Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 13:40:29 +0000
Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected
 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).

---
 src/nv_video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nv_video.c')

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"
-- 
cgit v1.2.3