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 | 216b8761e8119da2fdbf2ffad97271091513ff69 (patch) | |
| tree | 6a5cf111232b8e587e2d67e06fbbd743d5be19f2 /include | |
| parent | 64188a75fb04f8df179d690b9c3812ddd1c86d81 (diff) | |
- removing ': ' from lines which broke the build. These were added by axo-6_7_0XPRINT_BEGINXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0IPv6-REVIEW-BASEXPRINTXORG-RELEASE-1-TMXORG-RELEASE-1-STSFXORG-RELEASE-1IPv6-REVIEW
broken script that automatically removed spurious conflitcs do to CVS
tag mismatches. The 'XdotOrg' tag really haunts me!
Diffstat (limited to 'include')
| -rw-r--r-- | include/X11/extensions/XvMClib.h | 2 |
1 files changed, 1 insertions, 1 deletions
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_ |