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)
commite3734593aea202e99e77febea7b86c904080939f
tree69856674e2062c55ec5eec95eb0e31225a943084
parent221352bbd79a0ea92ce31cffb65537f62ee5668e
parent5cad143e545775acacee294049345c6a3868c51d
Merge commit 'origin/gallium-0.2' into gallium-xlib-rework

Conflicts:

progs/glsl/Makefile