st/mesa: some more merge fixes
authorChristian König <deathsimple@vodafone.de>
Sat, 4 Jun 2011 23:28:44 +0000 (01:28 +0200)
committerChristian König <deathsimple@vodafone.de>
Sat, 4 Jun 2011 23:28:44 +0000 (01:28 +0200)
commitbdfe77444d85cbd0f269ad35388e27c03e654574
tree51b026c208dcdc567183068477d80578be677e01
parent129a3c1cf0f9174d32db022b970ffb2127450ff9
st/mesa: some more merge fixes
src/mesa/state_tracker/st_format.c