Merge branch 'mesa_7_5_branch'
authorBrian Paul <brianp@vmware.com>
Mon, 11 May 2009 22:27:50 +0000 (16:27 -0600)
committerBrian Paul <brianp@vmware.com>
Mon, 11 May 2009 22:27:50 +0000 (16:27 -0600)
commite7cb125b2d9e9c7b1ad89b988fa3bf53ead9eb0c
treeb47a363853d2ed59184c3b9eb72ccb30d00cbebf
parent783e43064b64feb87e0457f96c2275160389f84c
parentf104e4d666dfccda6f5ad817693216733ddede44
Merge branch 'mesa_7_5_branch'

Conflicts:

Makefile
src/mesa/main/version.h
Makefile
src/mesa/state_tracker/st_atom_framebuffer.c