diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:35 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:35 +0000 |
commit | 960a41bf39b86b725666c73e829b184aef59544b (patch) | |
tree | 407264b6281f84cc236e1e54169dd2bd6431d527 /src/apm_rush.c | |
parent | e493f2ef41456a16d94a8f103a9a5a21174b9e6c (diff) |
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).
Diffstat (limited to 'src/apm_rush.c')
-rw-r--r-- | src/apm_rush.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/apm_rush.c b/src/apm_rush.c index 7e1580a..88e83ce 100644 --- a/src/apm_rush.c +++ b/src/apm_rush.c @@ -1,5 +1,5 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.1.4.2 2004/02/25 21:46:48 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.12 2003/02/12 21:46:42 tsi Exp $ */ +: /* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.1.4.2 2004/02/25 21:46:48 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.11tsi Exp $ */ /* * Copyright Loïc Grenié 1999 */ |