diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:36 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:36 +0000 |
| commit | 744a33a52832da9dfaff2f00f2e5756ca9bd9034 (patch) | |
| tree | 7591f776e9fc2a2d595a003c199692806b05b20c /get_load.c | |
| parent | 57c1cc6876edc8a1c85c88ebc51236d18c5de2d7 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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).
Diffstat (limited to 'get_load.c')
| -rw-r--r-- | get_load.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,6 +1,6 @@ /* $XdotOrg: xc/programs/xload/get_load.c,v 1.1.4.4 2003/12/20 00:28:32 kaleb Exp $ */ /* $XConsortium: get_load.c /main/37 1996/03/09 09:38:04 kaleb $ */ -/* $XFree86: xc/programs/xload/get_load.c,v 1.22 2003/12/22 17:48:13 tsi Exp $ */ +/* $XFree86: xc/programs/xload/get_load.c,v 1.21tsi Exp $ */ /* Copyright (c) 1989 X Consortium |