From 216b8761e8119da2fdbf2ffad97271091513ff69 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 12:46:30 +0000
Subject: - removing ': ' from lines which broke the build. These were added by
 a     broken script that automatically removed spurious conflitcs do to CVS  
   tag mismatches. The 'XdotOrg' tag really haunts me!

---
 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 f23f905..bc8d7cc 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.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_
-- 
cgit v1.2.3