diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:11 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:11 +0000 |
| commit | 52e7b836160f07d14f2286cc21a39a7ff9fdb76f (patch) | |
| tree | 47be993ad55ce309d79b3224c9a880a4d7f0475f /src/apm_rush.c | |
| parent | fc538709a371c4730d0cabd1131fd2c17cc941ec (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 'src/apm_rush.c')
| -rw-r--r-- | src/apm_rush.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/apm_rush.c b/src/apm_rush.c index c26a0d6..4c5161a 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.1 2003/12/18 19:29:14 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.12 2003/02/12 21:46:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.11tsi Exp $ */ /* * Copyright Loïc Grenié 1999 */ |