From: Keith Whitwell Date: Mon, 19 Jan 2009 10:32:35 +0000 (+0000) Subject: Merge commit 'origin/gallium-0.2' into gallium-xlib-rework X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=41b99b0070244450873414d4aaeb6d9e14dbaf3d;p=mesa.git 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 --- 41b99b0070244450873414d4aaeb6d9e14dbaf3d