Merge branch '7.8'
authorBrian Paul <brianp@vmware.com>
Thu, 22 Apr 2010 17:10:19 +0000 (11:10 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 22 Apr 2010 17:10:19 +0000 (11:10 -0600)
commitb4a191e351ff1ac1cd27cd7e02d169958a78ca86
tree2950f02f126fb3dcd63d908b11717f3e0cc2ff25
parent2eea1714fdffbd665a2076c7b8fed7b264a42968
parentb1a9c76b574f4da6b87c5a0750bfbe5bc98d1f4e
Merge branch '7.8'

Conflicts:

src/mesa/state_tracker/st_format.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/state_tracker/st_format.c