git.libre-soc.org Git - mesa.git/commit

author	Kristian Høgsberg <krh@bitplanet.net>
	Sun, 2 May 2010 14:17:07 +0000 (10:17 -0400)
committer	Kristian Høgsberg <krh@bitplanet.net>
	Sun, 2 May 2010 14:17:07 +0000 (10:17 -0400)
commit	0870e4a2022cff79805613ae7cd4b9237a2f564c
tree	694d0c07918661996255cff226602045e0d9c707	tree
parent	9d3360567346036f1c2b0b5e9de9bd123d883762	commit \| diff
parent	9fd5fa05122aa0cac0051fa92d1634bde43209db	commit \| diff

Merge branch 'gles2-2'

Conflicts:
src/mesa/drivers/dri/common/dri_util.h

12 files changed:

configs/autoconf.in	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
include/GL/internal/dri_interface.h	diff1 \|	diff2 \|	blob \| history
src/egl/drivers/dri2/egl_dri2.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/common/dri_util.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/common/dri_util.h	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/intel/intel_screen.c	diff1 \|	diff2 \|	blob \| history
src/mesa/drivers/dri/r600/r600_context.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/dlist.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/enums.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/shaders.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/teximage.c	diff1 \|	diff2 \|	blob \| history