diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-12-10 15:18:03 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-12-10 15:18:03 +1000 |
| commit | 9c278cb7fa7f18d13bde053fd75221cfba9da377 (patch) | |
| tree | e4eb9332de9c496c001ce74054c0b5353ca2f643 /Makefile.am | |
| parent | 6451ea2dcc4fac762442f699935864f4a8d445f7 (diff) | |
| parent | cc167b9bb7f1c3b8579e51e7bc2fca2f8eba6bd1 (diff) | |
Merge branch 'zaphod-lolz' of git://git.freedesktop.org/git/xorg/driver/xf86-video-ati into atombios-support
Conflicts:
src/radeon.h
src/radeon_crtc.c
src/radeon_driver.c
src/radeon_output.c
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions