Merge commit 'origin/st-shader-varients'
authorRoland Scheidegger <sroland@vmware.com>
Thu, 26 Nov 2009 00:15:25 +0000 (01:15 +0100)
committerRoland Scheidegger <sroland@vmware.com>
Thu, 26 Nov 2009 00:15:25 +0000 (01:15 +0100)
commit4dcdf3b9c67f1481d46c1decba84c9c55698db4c
tree7d43399738dd38344b511971891f349178a6f52d
parent9e3728c858e0f84b05a24f858f6aeba53fa4e7cb
parent07fafc7c9346aa260829603bf3188596481e9e62
Merge commit 'origin/st-shader-varients'

Conflicts:
src/mesa/state_tracker/st_atom_shader.c
src/mesa/state_tracker/st_program.c
src/mesa/state_tracker/st_atom.c
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_draw.c
src/mesa/state_tracker/st_program.c