diff options
| author | Dave Airlie <airlied@clockmaker.usersys.redhat.com> | 2007-08-23 19:42:19 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-08-23 19:43:58 +1000 |
| commit | c08e6ec9e7ac06caee53689b0ec50ef6a7a0ba37 (patch) | |
| tree | fcda07f47f2b006ac534c3480c57da870eeb75d4 /src/radeon_display.c | |
| parent | 5793e8753d11432bf95c7c6dd80c811e16aba058 (diff) | |
| parent | a0d0fcd3bab765b4db25e04884fd8a342abb9c66 (diff) | |
Merge branch 'master' into randr-merge
Conflicts:
src/radeon.h
src/radeon_bios.c
src/radeon_display.c
src/radeon_dri.c
src/radeon_driver.c
src/radeon_modes.c
src/radeon_probe.h
src/radeon_video.c
Diffstat (limited to 'src/radeon_display.c')
| -rw-r--r-- | src/radeon_display.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/radeon_display.c b/src/radeon_display.c index 43340169..e76ffa44 100644 --- a/src/radeon_display.c +++ b/src/radeon_display.c @@ -809,4 +809,3 @@ void RADEONUnblank(ScrnInfoPtr pScrn) } } } - |