diff options
author | Kristian Høgsberg <[email protected]> | 2011-11-02 12:01:23 -0400 |
---|---|---|
committer | Kristian Høgsberg <[email protected]> | 2011-11-02 12:01:46 -0400 |
commit | d14a1071582c9a802f0b37556665b79f38f7eaae (patch) | |
tree | 7d706e41b42cc85adc9d1a0a7fbeab02c80f0f41 /src/gallium/state_trackers/dri/sw | |
parent | 292c21bfdcb901d96b6c8f81afc771d1c0f41ee9 (diff) |
Fix gallium dri compile and a merge conflict
Diffstat (limited to 'src/gallium/state_trackers/dri/sw')
l--------- | src/gallium/state_trackers/dri/sw/dri_drawable.c | 1 |
1 files changed, 1 insertions, 0 deletions
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 |