Merge branch 'glsl2'
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 17 Aug 2010 02:08:53 +0000 (19:08 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 17 Aug 2010 02:08:53 +0000 (19:08 -0700)
commit6c03c576cc49bbb008de66d374f4302ff0fe0390
tree7ddeb3ee88532d9aef8728b9aa256edf7c125247
parent15a3b42e135a3a2cb463ec3cff80a55dd8528051
parenta433cd286c60eb9d4c2114f042709eda0f3de676
Merge branch 'glsl2'

Conflicts:
src/mesa/program/prog_optimize.c
src/mesa/SConscript
src/mesa/main/mtypes.h
src/mesa/program/hash_table.h
src/mesa/program/prog_instruction.h
src/mesa/program/prog_optimize.c
src/mesa/program/prog_print.h