Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
authorKeith Whitwell <keithw@vmware.com>
Mon, 19 Jan 2009 10:32:35 +0000 (10:32 +0000)
committerKeith Whitwell <keithw@vmware.com>
Mon, 19 Jan 2009 10:32:35 +0000 (10:32 +0000)
commit41b99b0070244450873414d4aaeb6d9e14dbaf3d
tree98f164e149b6cf97c3f46edbf8a0c8edbc16faab
parentb5db6b039c34117be4e441a2b95abbf97df928c3
parentea55b62f373a5fb63a684ce0d7f89240d3b888e7
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