Eric Anholt 6ea16bf6b0 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		2006-09-27 16:38:01 -07:00
..
Makefile.am	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.	2005-12-06 22:48:35 +00:00
i810.man	Merge branch 'master' into modesetting	2006-09-27 16:38:01 -07:00