summaryrefslogtreecommitdiff
path: root/xload.man
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:41:36 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:41:36 +0000
commit744a33a52832da9dfaff2f00f2e5756ca9bd9034 (patch)
tree7591f776e9fc2a2d595a003c199692806b05b20c /xload.man
parent57c1cc6876edc8a1c85c88ebc51236d18c5de2d7 (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 'xload.man')
-rw-r--r--xload.man2
1 files changed, 1 insertions, 1 deletions
diff --git a/xload.man b/xload.man
index e94911c..4da1e77 100644
--- a/xload.man
+++ b/xload.man
@@ -1,6 +1,6 @@
.\" $XConsortium: xload.man,v 1.29 94/04/17 20:43:44 matt Exp $
.\"
-.\" $XFree86: xc/programs/xload/xload.man,v 1.5 2002/10/12 16:06:48 herrb Exp $
+.\" $XFree86: xc/programs/xload/xload.man,v 1.4 2001/08/13 19:35:01 dawes Exp $
.\"
.TH XLOAD 1 __xorgversion__
.SH NAME