Eric Anholt 0c9e4aeea8 Merge branch 'master' into buffer-objects ... Conflicts: src/i830_dri.c src/i830_memory.c		2007-08-16 11:30:16 -07:00
..
Makefile.am	Bug #10520: i810 manpage not installed despite users expecting it to be there.	2007-04-10 11:26:46 -07:00
intel.man	Merge branch 'master' into buffer-objects	2007-08-16 11:30:16 -07:00