diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
commit | 0d7710911b9a873d466723a2f26b14930c3435ca (patch) | |
tree | a36cffda425b41fd95d025bc4bb9a82e6b085fec | |
parent | fd66831167324e4242e9e0c4113bf8e8b815fa55 (diff) |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
-rw-r--r-- | xfindproxy.c | 2 | ||||
-rw-r--r-- | xfindproxy.man | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xfindproxy.c b/xfindproxy.c index 7592167..aa2385f 100644 --- a/xfindproxy.c +++ b/xfindproxy.c @@ -25,7 +25,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xfindproxy/xfindproxy.c,v 1.9 2003/05/27 22:27:05 tsi Exp $ */ +/* $XFree86: xc/programs/xfindproxy/xfindproxy.c,v 1.8tsi Exp $ */ #include <stdio.h> diff --git a/xfindproxy.man b/xfindproxy.man index aa29256..122c6f8 100644 --- a/xfindproxy.man +++ b/xfindproxy.man @@ -24,7 +24,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/programs/xfindproxy/xfindproxy.man,v 1.7 2001/12/14 20:01:32 dawes Exp $ +.\" $XFree86: xc/programs/xfindproxy/xfindproxy.man,v 1.6 2001/01/27 18:21:12 dawes Exp $ .\" .TH XFINDPROXY 1 __xorgversion__ .SH NAME |