Fix gallium dri compile and a merge conflict
authorKristian Høgsberg <krh@bitplanet.net>
Wed, 2 Nov 2011 16:01:23 +0000 (12:01 -0400)
committerKristian Høgsberg <krh@bitplanet.net>
Wed, 2 Nov 2011 16:01:46 +0000 (12:01 -0400)
commitd14a1071582c9a802f0b37556665b79f38f7eaae
tree7d706e41b42cc85adc9d1a0a7fbeab02c80f0f41
parent292c21bfdcb901d96b6c8f81afc771d1c0f41ee9
Fix gallium dri compile and a merge conflict
src/gallium/state_trackers/dri/drm/dri2.c
src/gallium/state_trackers/dri/sw/dri_drawable.c [new symlink]
src/gallium/targets/Makefile.dri