diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 12:46:30 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 12:46:30 +0000 |
| commit | 84d94317e7b4af27a7b894eafab08f70237cc730 (patch) | |
| tree | e9d8b58352bd4711bac569753d0e95e320762610 /hw/xfree86 | |
| parent | 05e67c0b4c1dc67e845ca2faf07fbda4aea13447 (diff) | |
- 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!
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/x86emu/decode.c | 2 |
1 files changed, 1 insertions, 1 deletions
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" |