Merge commit 'origin/master' into gallium-0.2
authorBrian Paul <brian.paul@tungstengraphics.com>
Fri, 7 Nov 2008 17:17:31 +0000 (10:17 -0700)
committerBrian Paul <brian.paul@tungstengraphics.com>
Fri, 7 Nov 2008 17:17:31 +0000 (10:17 -0700)
commit3059ceb7f8128f00846f261f1927f5ec72d5dd15
tree54a225dcfe71df372242437aaff922e771fb674c
parent3225bc84932f08a52db7025367ae206a9d2f8fef
parenta98a25c25ff1ec3be74cf9c5f027b85a297c3e78
Merge commit 'origin/master' into gallium-0.2
src/mesa/main/ffvertex_prog.c
src/mesa/shader/prog_execute.c
src/mesa/shader/prog_instruction.h