Merge master and fix conflicts
authorAlex Deucher <alexdeucher@gmail.com>
Fri, 12 Jun 2009 16:09:34 +0000 (12:09 -0400)
committerAlex Deucher <alexdeucher@gmail.com>
Fri, 12 Jun 2009 16:09:34 +0000 (12:09 -0400)
commit1036ef2bf468611d37b5df06fc4424f2002e3837
treef0859a6d903c2570a0a00c918da88139f8f7d065
parent917f8bc1a85e61311cef6478127b387df70fba14
parent1cd0afffc9edbcac690f8ab436aecfced26b0aba
Merge master and fix conflicts
15 files changed:
configure.ac
src/mesa/drivers/dri/r600/r700_assembler.c
src/mesa/drivers/dri/r600/r700_clear.c
src/mesa/drivers/dri/r600/r700_state.c
src/mesa/drivers/dri/radeon/radeon_bo_legacy.c
src/mesa/drivers/dri/radeon/radeon_common.c
src/mesa/drivers/dri/radeon/radeon_common.h
src/mesa/drivers/dri/radeon/radeon_common_context.c
src/mesa/drivers/dri/radeon/radeon_common_context.h
src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
src/mesa/drivers/dri/radeon/radeon_dma.c
src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
src/mesa/drivers/dri/radeon/radeon_screen.c
src/mesa/drivers/dri/radeon/radeon_screen.h
src/mesa/drivers/dri/radeon/radeon_texture.c