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)
commitf0f04cd12db156ec53b7ea46fae27199af121f90
treefdf67a4fd47d4b12eec75aac85496420ca95dbd6
parente1ee3eaf6d739ddaa31bad1316e000c6220fa707
parenta29c7948d965ad274ae7ac98fe01f2f877b19d94
Merge branch '7.8' into master

Conflicts:
Makefile
src/mesa/main/version.h
Makefile
src/mesa/drivers/dri/r600/r700_state.c
src/mesa/state_tracker/st_cb_texture.c