Merge branch 'master' into asm-shader-rework-2
authorIan Romanick <ian.d.romanick@intel.com>
Thu, 10 Sep 2009 22:33:45 +0000 (15:33 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Thu, 10 Sep 2009 22:33:45 +0000 (15:33 -0700)
commitb8e1e8d2d8ae6ffbf8f271b46ee89788a926b3b0
tree5db502ab80287bfc8ff61082784017c7448464f5
parent81722c5d7e8e93d837510b9e6e5d014ec64cf4b3
parentd9dc4cb0e4f578da9e50c9d1ba6fd9c22ea2fca6
Merge branch 'master' into asm-shader-rework-2

Conflicts:
src/mesa/shader/lex.yy.c
src/mesa/shader/program_parse.tab.c
src/mesa/shader/program_parse.tab.h
src/mesa/drivers/dri/swrast/swrast.c
src/mesa/main/extensions.c
src/mesa/main/mtypes.h
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