From a22b9c5b19ff586c24d5beb26e327c4d85214dd8 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 4 Mar 2004 17:49:14 +0000 Subject: 18. Merged in XFree86 code up to 4.4.0 including changes to files that had a changed license. There was only one change which happened to be from me (Egbert Eich). --- get_load.c | 2 +- get_rload.c | 2 +- xload.c | 2 +- xload.h | 2 +- xload.man | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/get_load.c b/get_load.c index 985dc92..c614598 100644 --- a/get_load.c +++ b/get_load.c @@ -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 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 #include diff --git a/xload.c b/xload.c index 60ce080..65595f0 100644 --- a/xload.c +++ b/xload.c @@ -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 diff --git a/xload.h b/xload.h index 300c8e4..d32383c 100644 --- a/xload.h +++ b/xload.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/xload/xload.h,v 1.2 2001/08/28 17:10:39 tsi Exp $ */ +/* $XFree86: xc/programs/xload/xload.h,v 1.1 2001/08/27 23:35:14 dawes Exp $ */ #ifndef _XLOAD_H_ #define _XLOAD_H_ 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