Merge branch 'mesa_7_6_branch'
authorPauli Nieminen <suokkos@gmail.com>
Thu, 24 Sep 2009 17:39:01 +0000 (20:39 +0300)
committerPauli Nieminen <suokkos@gmail.com>
Thu, 24 Sep 2009 17:39:16 +0000 (20:39 +0300)
commitfd56bee6c4de28da194333f93b52c40f1deb6163
tree5f2fe07d52f999cdf3698ef8dbc4378faeb7538d
parentc9f7a23ef05adfd2ebae56ee9f1b19897a589831
parent1d2dca194cebe6e25735b6820f85b8d1231aae63
Merge branch 'mesa_7_6_branch'
src/mesa/drivers/dri/r600/r700_state.c
src/mesa/drivers/dri/radeon/radeon_common.c