Merge commit 'origin/master' into gallium-0.2
authorKeith Whitwell <keith@tungstengraphics.com>
Thu, 18 Sep 2008 17:57:46 +0000 (18:57 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Thu, 18 Sep 2008 18:03:02 +0000 (19:03 +0100)
commit89ab66448e1bcd78caab6678261c2885dcff741c
treebe36d7e3eba3f64e54da34ff7ba64b3eb14e56aa
parent1074e8e4e47bb4af73c7ef730d0fec40e826cc7e
parent5e530d8384b0d9bb867d6407315587c84a443902
Merge commit 'origin/master' into gallium-0.2

Conflicts:

progs/trivial/Makefile
src/mesa/glapi/glthread.c
16 files changed:
progs/trivial/Makefile
src/glu/sgi/libnurbs/interface/mystdio.h
src/glu/sgi/libnurbs/internals/backend.cc
src/glu/sgi/libnurbs/internals/backend.h
src/glu/sgi/libnurbs/internals/bufpool.cc
src/glu/sgi/libnurbs/internals/bufpool.h
src/glu/sgi/libnurbs/internals/knotvector.h
src/glu/sgi/libnurbs/internals/nurbstess.cc
src/mesa/drivers/dri/tdfx/tdfx_screen.c
src/mesa/glapi/glthread.c
src/mesa/main/bufferobj.c
src/mesa/main/dlist.c
src/mesa/main/mtypes.h
src/mesa/main/state.c
src/mesa/shader/shader_api.c
src/mesa/swrast/s_texfilter.c