Merge branch 'master' into glsl-pp-rework-2
authorMichal Krol <michal@vmware.com>
Sat, 12 Dec 2009 15:48:32 +0000 (16:48 +0100)
committerMichal Krol <michal@vmware.com>
Sat, 12 Dec 2009 15:48:32 +0000 (16:48 +0100)
commita3eb0f718e19653a2ad8e49396c904183be456f3
tree0092574c469ea586a6cab8b8ebb7ac62b8221a2a
parent491f384c3958067e6c4c994041f5d8d413b806bc
parent784cca9fa527de771754d76545970f78094b9adf
Merge branch 'master' into glsl-pp-rework-2

Conflicts:
progs/perf/drawoverhead.c
progs/perf/teximage.c
progs/perf/vbo.c
progs/perf/vertexrate.c
src/mesa/shader/slang/library/slang_common_builtin_gc.h
Makefile
SConstruct
configs/default
src/gallium/winsys/gdi/SConscript
src/mesa/Makefile
src/mesa/SConscript
src/mesa/shader/slang/slang_compile.c
src/mesa/sources.mak