Merge branch '7.8'
authorBrian Paul <brianp@vmware.com>
Tue, 23 Mar 2010 15:14:17 +0000 (09:14 -0600)
committerBrian Paul <brianp@vmware.com>
Tue, 23 Mar 2010 15:14:17 +0000 (09:14 -0600)
commit2689dd304c6d644b04c941e6da63e466be5de0d6
tree26e2878e1d4457205254fcdcc877e3c192e0cec5
parent83f4c444f4e630fe2bfd17ad750f3f17ceff13f6
parentff54af530bc17429eda73a761dd6b73e3ec0d6ef
Merge branch '7.8'

Conflicts:

Makefile
src/gallium/state_trackers/glx/xlib/xm_api.c
src/mesa/drivers/dri/intel/intel_blit.c
src/mesa/drivers/dri/intel/intel_pixel_copy.c
src/mesa/main/version.h
Makefile