r300g,llvmpipe: fix some more merge problems
authorRoland Scheidegger <sroland@vmware.com>
Fri, 27 Nov 2009 16:40:24 +0000 (17:40 +0100)
committerRoland Scheidegger <sroland@vmware.com>
Fri, 27 Nov 2009 16:40:24 +0000 (17:40 +0100)
commitb748a9f574361273df6b05c06c647ac4fd9b3e41
tree0ca1854cb84b5ae3d5d541873f2f937beb4ddd58
parentc95cbd45c657ac47e908a4d99d118737034bde43
r300g,llvmpipe: fix some more merge problems
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/r300/r300_emit.c