[g3dvl] fix merge conflicts
authorChristian König <deathsimple@vodafone.de>
Wed, 22 Dec 2010 20:38:48 +0000 (21:38 +0100)
committerChristian König <deathsimple@vodafone.de>
Wed, 22 Dec 2010 20:38:48 +0000 (21:38 +0100)
commit2191d8064e9d177311f0833241d16384ead89e1a
tree1a24d3974ffe60f1289d05bddcc176af0c683a31
parente179a8bf34022c200deee92d328cb1bae3c3aa4a
[g3dvl] fix merge conflicts
src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_vertex_buffers.c