diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:49:04 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:49:04 +0000 |
commit | 02f4121010581b46c22df5c699c334b8e166a5e3 (patch) | |
tree | a36cffda425b41fd95d025bc4bb9a82e6b085fec | |
parent | fd66831167324e4242e9e0c4113bf8e8b815fa55 (diff) |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadxo-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
a changed license. There was only one change which happened to be from
me (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 |