diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:49:14 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:49:14 +0000 |
commit | a22b9c5b19ff586c24d5beb26e327c4d85214dd8 (patch) | |
tree | 7591f776e9fc2a2d595a003c199692806b05b20c /xload.c | |
parent | 57c1cc6876edc8a1c85c88ebc51236d18c5de2d7 (diff) |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEXORG-RELEASE-1-TMIPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'xload.c')
-rw-r--r-- | xload.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,5 +1,5 @@ /* $XConsortium: xload.c,v 1.37 94/04/17 20:43:44 converse Exp $ */ -/* $XFree86: xc/programs/xload/xload.c,v 1.7 2002/09/18 17:11:57 tsi Exp $ */ +/* $XFree86: xc/programs/xload/xload.c,v 1.6tsi Exp $ */ /* Copyright (c) 1989 X Consortium |