Merge branch '7.8' into master
authorPauli Nieminen <suokkos@gmail.com>
Wed, 17 Mar 2010 09:26:48 +0000 (11:26 +0200)
committerPauli Nieminen <suokkos@gmail.com>
Wed, 17 Mar 2010 09:26:48 +0000 (11:26 +0200)
Conflicts:
Makefile
src/mesa/main/version.h

1  2 
Makefile
src/mesa/drivers/dri/r600/r700_state.c
src/mesa/state_tracker/st_cb_texture.c

diff --cc Makefile
Simple merge