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_rload.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_rload.c')
| -rw-r--r-- | get_rload.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/get_rload.c b/get_rload.c index 0ff77b4..efee824 100644 --- a/get_rload.c +++ b/get_rload.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xload/get_rload.c,v 1.5 2002/01/07 21:46:49 dawes Exp $ */ +/* $XFree86: xc/programs/xload/get_rload.c,v 1.4 2002/01/07 20:38:31 dawes Exp $ */ #include <stdio.h> #include <X11/Intrinsic.h> |