From d14a1071582c9a802f0b37556665b79f38f7eaae Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Wed, 2 Nov 2011 12:01:23 -0400 Subject: Fix gallium dri compile and a merge conflict --- src/gallium/state_trackers/dri/sw/dri_drawable.c | 1 + 1 file changed, 1 insertion(+) create mode 120000 src/gallium/state_trackers/dri/sw/dri_drawable.c (limited to 'src/gallium/state_trackers/dri/sw') diff --git a/src/gallium/state_trackers/dri/sw/dri_drawable.c b/src/gallium/state_trackers/dri/sw/dri_drawable.c new file mode 120000 index 00000000000..0fc19be6ea6 --- /dev/null +++ b/src/gallium/state_trackers/dri/sw/dri_drawable.c @@ -0,0 +1 @@ +../common/dri_drawable.c \ No newline at end of file -- cgit v1.2.3