Merge branch 'mesa_7_5_branch'
authorJakob Bornecrantz <jakob@vmware.com>
Sat, 4 Jul 2009 05:43:01 +0000 (07:43 +0200)
committerJakob Bornecrantz <jakob@vmware.com>
Sat, 4 Jul 2009 05:43:01 +0000 (07:43 +0200)
commit28471cfa970702128d822c2ecbb1703eedbca245
treefa91f0d366ba857e228946ac88966e1717dc879f
parent9982821cdaf2205443c6297368eaab4115bf92f6
parent71633abafc935c25da9731bab48c228ceb9b4097
Merge branch 'mesa_7_5_branch'
src/mesa/state_tracker/st_framebuffer.c
src/mesa/state_tracker/st_program.c