From 744a33a52832da9dfaff2f00f2e5756ca9bd9034 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 5 Mar 2004 13:41:36 +0000
Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected
 files.     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).

---
 xload.man | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'xload.man')

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
-- 
cgit v1.2.3