Alan Hourihane 47ad296a18 Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into gallium-0.2 ... Conflicts: src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/main/texstore.c src/mesa/tnl/t_vp_build.c src/mesa/vbo/vbo_exec_draw.c		2008-09-11 17:32:18 +01:00
..
dri_interface.h	DRI2: Drop sarea, implement swap buffers in the X server.	2008-08-29 12:13:14 -04:00
glcore.h	Merge branch 'gallium-0.1' into gallium-0.2	2008-09-11 16:05:15 +01:00
sarea.h	Remove CVS keywords.	2008-05-26 20:14:40 +09:00