From 4be3434b1362478149787efad07ababa75e705f7 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 18:43:06 +0000
Subject: Merging XORG-CURRENT into trunk

---
 Xvproto.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Xvproto.h')

diff --git a/Xvproto.h b/Xvproto.h
index b4d8f22..9112f51 100644
--- a/Xvproto.h
+++ b/Xvproto.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/extensions/Xvproto.h,v 1.6 2001/05/07 21:37:12 tsi Exp $ */
+/* $XFree86: xc/include/extensions/Xvproto.h,v 1.5 2000/01/25 00:08:07 mvojkovi Exp $ */
 
 #ifndef XVPROTO_H
 #define XVPROTO_H
-- 
cgit v1.2.1