Merge branch '7.8'
authorBrian Paul <brianp@vmware.com>
Wed, 28 Apr 2010 16:10:51 +0000 (10:10 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 28 Apr 2010 16:10:51 +0000 (10:10 -0600)
commitc7f5c9a3dc6350252e73b541bb85ab3ed9e64a9c
tree2d3eca74c6b3b59a26de5a9ea9d59d839d64115a
parent40dcbb87a9014adf6b3f11f8f0642800f449056c
parent7b640f9f708306b3e8c661771f29bf24bf8687fb
Merge branch '7.8'

Conflicts:

src/mesa/state_tracker/st_gen_mipmap.c
src/mesa/state_tracker/st_cb_texture.c
src/mesa/state_tracker/st_gen_mipmap.c