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

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

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