Some more merge fixes
authorChristian König <deathsimple@vodafone.de>
Sat, 23 Oct 2010 11:54:47 +0000 (13:54 +0200)
committerChristian König <deathsimple@vodafone.de>
Sat, 23 Oct 2010 11:54:47 +0000 (13:54 +0200)
commitba9caba9c8b8d469dbdff677274d574b9051bc45
treeac8e797d3e7785ccd7e711fbbf8c310589954005
parentb13a0af510b71e86f9634dc959dc355ea7044674
Some more merge fixes
src/gallium/winsys/g3dvl/dri/dri_winsys.c