Merge branch 'asm-shader-rework-2'
authorIan Romanick <ian.d.romanick@intel.com>
Fri, 25 Sep 2009 23:57:38 +0000 (16:57 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Fri, 25 Sep 2009 23:57:38 +0000 (16:57 -0700)
commit8130375e775bd5ba6a47412b0ea8ec9f23dc5972
tree34925730997476c0e8046045551ffc4f0c317116
parentc19482b16f164ce1b6625d18950a4644e5834373
parent09af58d7ed7dfa8f2ce2b881bb849064e136c830
Merge branch 'asm-shader-rework-2'

Conflicts:
src/mesa/shader/program_parse.tab.c
src/mesa/drivers/dri/swrast/swrast.c
src/mesa/main/extensions.c
src/mesa/main/mtypes.h
src/mesa/shader/program_parse.tab.c
src/mesa/shader/program_parse.y