From 4e92ef88124207e46e99d3215de66bd82372ce8e Mon Sep 17 00:00:00 2001
From: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
Date: Wed, 17 Mar 2004 20:32:08 +0000
Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)

---
 Xext/xvdix.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Xext/xvdix.h')

diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 8dafa8b26..d4bff69ad 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.8 2001/07/25 15:05:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.7 2001/05/07 21:37:51 tsi Exp $ */
 
 #ifndef XVDIX_H
 #define XVDIX_H
-- 
cgit v1.2.3