Merge commit 'origin/master' into gallium-sampler-view
authorKeith Whitwell <keithw@vmware.com>
Tue, 16 Mar 2010 09:02:38 +0000 (09:02 +0000)
committerKeith Whitwell <keithw@vmware.com>
Tue, 16 Mar 2010 09:02:38 +0000 (09:02 +0000)
commit8cdfd1219a2d13d252a8691ee6dddb0d773bdc77
tree087318efba7eb0fb5e1c1d8422eca611abdee3e7
parent6420aca08ba6910dce22ab9f813cc57d611b0aa8
parente0ce4a4a0994211ead8e5a77cccdd2a084e8a288
Merge commit 'origin/master' into gallium-sampler-view

This branch already seems to have the nv50_tex.c fix.

Conflicts:
src/gallium/drivers/nv50/nv50_tex.c
src/gallium/drivers/llvmpipe/lp_state.h
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/state_tracker/st_context.c
src/mesa/state_tracker/st_context.h