projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 221352b 5cad143)
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework
authorKeith Whitwell <keithw@vmware.com>
Fri, 9 Jan 2009 10:08:06 +0000 (10:08 +0000)
committerKeith Whitwell <keithw@vmware.com>
Fri, 9 Jan 2009 10:08:06 +0000 (10:08 +0000)
Conflicts:

progs/glsl/Makefile


Trivial merge