Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
authorBrian Paul <brianp@vmware.com>
Tue, 15 Sep 2009 15:45:18 +0000 (09:45 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 15 Sep 2009 15:45:18 +0000 (09:45 -0600)
commit5d526ed21ac9f1ec9220c2adb4c905893eb9d990
tree2e9c6b0794d903aa9c137d591f956619a51608d7
parent2b992dc327e02a412c0cc8c5d015ac534114848c
parent799631acb18be93afab29e27241cde3780672e98
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
configs/default
configure.ac
src/mesa/main/texparam.c
src/mesa/shader/shader_api.c
src/mesa/shader/slang/slang_link.c