diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:19 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:19 +0000 |
| commit | 397653e558b5fa4936ee6c9ac1eb6acaa9cf1cbc (patch) | |
| tree | 5988c3f829963dfa7315e626c4d0e72e85d76e09 /src/radeon_common.h | |
| parent | 42cbea1d05a9e44b0d560da29bff19711ebb8a94 (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/radeon_common.h')
| -rw-r--r-- | src/radeon_common.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/radeon_common.h b/src/radeon_common.h index 5f517f5d..924c7ffd 100644 --- a/src/radeon_common.h +++ b/src/radeon_common.h @@ -32,8 +32,7 @@ * Jens Owen <jens@tungstengraphics.com> * * $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.1.4.2 2003/12/06 13:24:24 kaleb Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.9 - * 2003/12/13 22:07:22 tsi Exp $ + * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.8tsi Exp $ * */ |