diff options
| author | Alex Deucher <alex@samba.(none)> | 2008-02-24 05:37:22 -0500 |
|---|---|---|
| committer | Alex Deucher <alex@samba.(none)> | 2008-02-24 05:37:22 -0500 |
| commit | 85e470e64f629de72e361c77770e2e29998d1bf4 (patch) | |
| tree | 547b9c164d3279b0cd348e2d7cb0ce3a951cebad /src/ativalid.h | |
| parent | 27ddb39b12a0b54e099fd5274c4c91f08e2d2822 (diff) | |
| parent | 1b84c76f27c8d24cb42beae26abf000721901c1c (diff) | |
Merge master and fix conflicts
Merge branch 'master' of ssh://agd5f@git.freedesktop.org/git/xorg/driver/xf86-video-ati
Conflicts:
src/radeon_commonfuncs.c
Diffstat (limited to 'src/ativalid.h')
0 files changed, 0 insertions, 0 deletions