diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:42 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:42 +0000 |
| commit | 93da676de2d4782f60138b4297840631b371e428 (patch) | |
| tree | 7a27af1b8ddc2ec8afa6c668ed387e8496e2e7a0 /util | |
| parent | 1dec1a58dbac91deeddab0807c566d48154b7b57 (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'util')
| -rw-r--r-- | util/AsmMacros.h | 2 | ||||
| -rw-r--r-- | util/dRegs.c | 2 | ||||
| -rw-r--r-- | util/mRegs.c | 2 | ||||
| -rw-r--r-- | util/modClock.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/util/AsmMacros.h b/util/AsmMacros.h index feb5ce0..24070b9 100644 --- a/util/AsmMacros.h +++ b/util/AsmMacros.h @@ -57,7 +57,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/AsmMacros.h,v 1.1 2001/11/16 21:13:34 tsi Exp $ */ +/* $XFree86$ */ #if defined(__GNUC__) #if defined(linux) && (defined(__alpha__) || defined(__ia64__)) diff --git a/util/dRegs.c b/util/dRegs.c index 0c8ee62..51a384b 100644 --- a/util/dRegs.c +++ b/util/dRegs.c @@ -4,7 +4,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/dRegs.c,v 1.9 2001/11/16 21:13:34 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/dRegs.c,v 1.8 2001/10/01 13:44:04 eich Exp $ */ #ifdef __NetBSD__ # include <sys/types.h> diff --git a/util/mRegs.c b/util/mRegs.c index 4d8da11..b1688de 100644 --- a/util/mRegs.c +++ b/util/mRegs.c @@ -4,7 +4,7 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c,v 1.6 2001/11/16 21:13:34 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c,v 1.5 2000/10/23 12:10:13 alanh Exp $ */ #ifdef __NetBSD__ # include <sys/types.h> diff --git a/util/modClock.c b/util/modClock.c index cce4f84..48a1961 100644 --- a/util/modClock.c +++ b/util/modClock.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/modClock.c,v 1.6 2001/11/16 21:13:34 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/modClock.c,v 1.5 2001/05/09 19:57:06 dbateman Exp $ */ #ifdef __NetBSD__ # include <sys/types.h> |