From d352d5edc8c86417c5662d905f8f8b6e526248f8 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 4 Mar 2004 17:47:00 +0000
Subject: 18. Merged in XFree86 code up to 4.4.0 including changes to files
 that had     a changed license. There was only one change which happened to
 be from     me (Egbert Eich).

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

(limited to 'src/Xv.c')

diff --git a/src/Xv.c b/src/Xv.c
index c79ded9..78ca573 100644
--- a/src/Xv.c
+++ b/src/Xv.c
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xv/Xv.c,v 1.18 2003/11/29 01:02:32 dawes Exp $ */
+/* $XFree86: xc/lib/Xv/Xv.c,v 1.17 2003/04/28 16:56:27 dawes Exp $ */
 /* $XdotOrg: xc/lib/Xv/Xv.c,v 1.18 2003/11/29 01:02:32 dawes Exp $ */
 /*
 ** File: 
-- 
cgit v1.2.3