Eric Anholt 9948d8377d Merge branch 'master' into modesetting ... Conflicts: src/i830.h src/i830_cursor.c src/i830_dri.c src/i830_driver.c src/i830_video.c		2006-11-16 19:47:24 -08: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-11-16 19:47:24 -08:00