summaryrefslogtreecommitdiff
path: root/configs/linux-static
diff options
context:
space:
mode:
authorKeith Whitwell <keithw@vmware.com>2009-01-19 10:32:35 +0000
committerKeith Whitwell <keithw@vmware.com>2009-01-19 10:32:35 +0000
commit41b99b0070244450873414d4aaeb6d9e14dbaf3d (patch)
tree98f164e149b6cf97c3f46edbf8a0c8edbc16faab /configs/linux-static
parentb5db6b039c34117be4e441a2b95abbf97df928c3 (diff)
parentea55b62f373a5fb63a684ce0d7f89240d3b888e7 (diff)
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
Conflicts: src/gallium/state_trackers/glx/xlib/fakeglx.c src/gallium/state_trackers/glx/xlib/xm_api.c src/gallium/winsys/xlib/xmesaP.h
Diffstat (limited to 'configs/linux-static')
0 files changed, 0 insertions, 0 deletions