diff options
| author | Egbert Eich <eich-at-freedesktop-dot-org> | 2004-03-05 13:40:19 +0000 |
|---|---|---|
| committer | Egbert Eich <eich-at-freedesktop-dot-org> | 2004-03-05 13:40:19 +0000 |
| commit | fc116ff0c6812b4be96ba4b8c2213985598887fc (patch) | |
| tree | dd4c2992ac52685582843a410ba8ecca25203fe0 /src/r128_dripriv.h | |
| parent | d4c29a12e0dc88af0dd197124355d18e9372a9d9 (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/r128_dripriv.h')
| -rw-r--r-- | src/r128_dripriv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/r128_dripriv.h b/src/r128_dripriv.h index 7f84987..043e7bd 100644 --- a/src/r128_dripriv.h +++ b/src/r128_dripriv.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dripriv.h,v 1.3 2000/11/18 19:37:11 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dripriv.h,v 1.2 2000/11/09 03:24:35 martin Exp $ */ /* * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, * Precision Insight, Inc., Cedar Park, Texas, and |