Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Wed, 28 Oct 2009 17:33:51 +0000 (11:33 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 28 Oct 2009 17:33:51 +0000 (11:33 -0600)
commit7d56caabe45e91a67096804c7e341d04d01db7aa
tree1632cea88f33bf4fe39d198185596d05d44d83bb
parent182ff3e47a2d18917cdf3344c2ce95bd0a460784
parent0219cd0961e6b47761fe6984dc6c0a8bfa6057d8
Merge branch 'mesa_7_6_branch'

Conflicts:

src/mesa/shader/lex.yy.c
src/mesa/shader/program_lexer.l
src/mesa/drivers/dri/intel/intel_mipmap_tree.c
src/mesa/drivers/dri/intel/intel_span.c
src/mesa/shader/lex.yy.c
src/mesa/shader/program_lexer.l
src/mesa/shader/program_parse.tab.c
src/mesa/shader/program_parse.tab.h
src/mesa/shader/program_parse.y
src/mesa/shader/program_parser.h