From 84d94317e7b4af27a7b894eafab08f70237cc730 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!

---
 hw/xfree86/x86emu/decode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/x86emu/decode.c b/hw/xfree86/x86emu/decode.c
index aa3980eab..45a1a4b4c 100644
--- a/hw/xfree86/x86emu/decode.c
+++ b/hw/xfree86/x86emu/decode.c
@@ -37,7 +37,7 @@
 *
 ****************************************************************************/
 
-: /* $XdotOrg: xc/extras/x86emu/src/x86emu/decode.c,v 1.12 2003/12/05 19:23:23 dawes Exp $ */
+/* $XdotOrg: xc/extras/x86emu/src/x86emu/decode.c,v 1.12 2003/12/05 19:23:23 dawes Exp $ */
 /* $XFree86: xc/extras/x86emu/src/x86emu/decode.c,v 1.11 2002/07/23 20:20:43 tsi Exp $ */
 
 #include "x86emu/x86emui.h"
-- 
cgit v1.2.3