Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa into 965...
authorZou Nan hai <nanhai.zou@intel.com>
Wed, 4 Jul 2007 02:52:35 +0000 (10:52 +0800)
committerZou Nan hai <nanhai.zou@intel.com>
Wed, 4 Jul 2007 02:52:35 +0000 (10:52 +0800)
commitfb9ee9b323bff93973a39560b2bc007aace4bddd
tree05e1e72e8f4d321cde2c48b8518e6d9736c680dd
parent285b326c606e9b2f90e4fe177b15b3fa23239b86
parent7ff4359a3be1278b26950f96ab23014a667af838
Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa into 965-glsl
src/mesa/drivers/dri/i965/brw_vs_tnl.c
src/mesa/drivers/dri/i965/intel_context.c
src/mesa/shader/slang/slang_codegen.c