diff options
| author | Eric Anholt <eric@anholt.net> | 2006-09-27 16:38:01 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2006-09-27 16:38:01 -0700 |
| commit | 6ea16bf6b06c8b3aed4d2c98679ab28304d1b56c (patch) | |
| tree | 1f711e8fb7338d6bee527d084a6ea12421087d79 /src/i830_gtf.c | |
| parent | fdb6de663579d3b9f31bf9e8a93430b8505ca73f (diff) | |
| parent | b970166eab95ac024ff481b0f5fd9aaf3644aabf (diff) | |
Merge branch 'master' into modesetting
This reverts most of the mergedfb code. This will instead be done in device-
independent RandR code.
Conflicts:
src/Makefile.am
src/i810_driver.c
src/i810_reg.h
src/i830.h
src/i830_cursor.c
src/i830_driver.c
src/i830_modes.c
src/i830_video.c
Diffstat (limited to 'src/i830_gtf.c')
0 files changed, 0 insertions, 0 deletions