diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:50 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:50 +0000 |
commit | 2b4c1b2a0d337e5c2f3e57b6de0820d6e5af6f6b (patch) | |
tree | 4766fd5b9777c3fb1fdcdd198a231e95ea3a1087 /di/options.c | |
parent | fd0ee4bdf5c7a26175c556a8214d70249d56b349 (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).
Diffstat (limited to 'di/options.c')
-rw-r--r-- | di/options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/di/options.c b/di/options.c index 72b3577..95daf6b 100644 --- a/di/options.c +++ b/di/options.c @@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/lbxproxy/di/options.c,v 1.9 2003/12/19 02:05:39 dawes Exp $ */ +/* $XFree86: xc/programs/lbxproxy/di/options.c,v 1.8 2003/09/13 21:33:10 dawes Exp $ */ #include <stdio.h> #include "X.h" |