From e65ca2dad2003739f5b75407bd0523538dd0d8ac Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@epoch.ncsc.mil>
Date: Tue, 4 May 2004 19:42:52 +0000
Subject: Merge the new release from HEAD

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

diff --git a/src/Xv.c b/src/Xv.c
index 78ca573..80f1776 100644
--- a/src/Xv.c
+++ b/src/Xv.c
@@ -22,7 +22,7 @@ SOFTWARE.
 
 ******************************************************************/
 /* $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 $ */
+/* $XdotOrg: xc/lib/Xv/Xv.c,v 1.2 2004/04/23 18:43:55 eich Exp $ */
 /*
 ** File: 
 **
-- 
cgit v1.2.1