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

---
 include/X11/extensions/XvMClib.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include/X11/extensions')

diff --git a/include/X11/extensions/XvMClib.h b/include/X11/extensions/XvMClib.h
index 16b009d..bc8d7cc 100644
--- a/include/X11/extensions/XvMClib.h
+++ b/include/X11/extensions/XvMClib.h
@@ -1,4 +1,5 @@
-/* $XFree86: xc/include/extensions/XvMClib.h,v 1.7 2003/12/18 05:48:06 dawes Exp $ */
+/* $XdotOrg: xc/include/extensions/XvMClib.h,v 1.7 2003/12/18 05:48:06 dawes Exp $ */
+/* $XFree86: xc/include/extensions/XvMClib.h,v 1.6 2001/11/14 21:54:37 mvojkovi Exp $ */
 
 #ifndef _XVMCLIB_H_
 #define _XVMCLIB_H_
-- 
cgit v1.2.3