diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 12:46:31 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 12:46:31 +0000 |
| commit | 300dabdfc8270730d85f88b01bc53e7dbfa615ac (patch) | |
| tree | c481a7d333eca5e4b2a86a6e4b6019be3b2a1198 | |
| parent | 02136dd7f4fb722a4e9482f920944a002a8449b9 (diff) | |
- removing ': ' from lines which broke the build. These were added by aXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
broken script that automatically removed spurious conflitcs do to CVS
tag mismatches. The 'XdotOrg' tag really haunts me!
| -rw-r--r-- | include/X11/extensions/XRes.h | 2 | ||||
| -rw-r--r-- | man/XRes.man | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/X11/extensions/XRes.h b/include/X11/extensions/XRes.h index 5cb43aa..5b3374e 100644 --- a/include/X11/extensions/XRes.h +++ b/include/X11/extensions/XRes.h @@ -1,7 +1,7 @@ /* Copyright (c) 2002 XFree86 Inc */ -: /* $XdotOrg: xc/include/extensions/XRes.h,v 1.4 2003/12/18 05:48:06 dawes Exp $ */ +/* $XdotOrg: xc/include/extensions/XRes.h,v 1.4 2003/12/18 05:48:06 dawes Exp $ */ /* $XFree86: xc/include/extensions/XRes.h,v 1.3 2002/03/10 22:05:51 mvojkovi Exp $ */ #ifndef _XRES_H diff --git a/man/XRes.man b/man/XRes.man index 3654777..179e308 100644 --- a/man/XRes.man +++ b/man/XRes.man @@ -1,5 +1,5 @@ .\" -: .\" $XdotOrg: xc/lib/XRes/XRes.man,v 1.3 2003/12/04 19:10:30 dawes Exp $ +.\" $XdotOrg: xc/lib/XRes/XRes.man,v 1.3 2003/12/04 19:10:30 dawes Exp $ .\" $XFree86: xc/lib/XRes/XRes.man,v 1.2 2003/10/13 21:22:54 herrb Exp $ .\" .\" Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. |