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

projects / mesa.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b645822 4d42c5b)

author	Alan Hourihane <alanh@tungstengraphics.com>
	Thu, 11 Sep 2008 16:32:18 +0000 (17:32 +0100)
committer	Alan Hourihane <alanh@tungstengraphics.com>
	Thu, 11 Sep 2008 16:32:18 +0000 (17:32 +0100)
commit	47ad296a183929c2007c35c60d722b4ac680417d
tree	62bcc7af01606d32d7f137ccf8f342c9b0a6774a	tree
parent	b6458225039ef4cf5c91080e7547ed73fb264c46	commit \| diff
parent	4d42c5bebf8740ebfc15571d24b6c92f79e09263	commit \| diff

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

19 files changed:

configs/default	diff1 \|	diff2 \|	blob \| history
docs/news.html	diff1 \|	diff2 \|	blob \| history
src/glx/x11/glxclient.h	diff1 \|	diff2 \|	blob \| history
src/glx/x11/glxcmds.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/main/arrayobj.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/attrib.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/bufferobj.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/bufferobj.h	diff1 \|	diff2 \|	blob \| history
src/mesa/main/extensions.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/framebuffer.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/imports.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/light.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/texstore.c	diff1 \|	diff2 \|	blob \| history
src/mesa/main/varray.c	diff1 \|	diff2 \|	blob \| history
src/mesa/tnl/t_vp_build.c	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_exec_api.c	diff1 \|	diff2 \|	blob \| history
src/mesa/vbo/vbo_exec_draw.c	diff1 \|	diff2 \|	blob \| history