projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5db6b0 ea55b62)
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)
Conflicts:

src/gallium/state_trackers/glx/xlib/fakeglx.c
src/gallium/state_trackers/glx/xlib/xm_api.c
src/gallium/winsys/xlib/xmesaP.h


Trivial merge