Merge commit 'origin/gallium-0.1'
authorKeith Whitwell <keithw@vmware.com>
Wed, 18 Feb 2009 15:14:39 +0000 (15:14 +0000)
committerKeith Whitwell <keithw@vmware.com>
Wed, 18 Feb 2009 15:14:39 +0000 (15:14 +0000)
commit76d8951fd3adbb91b2f71d461eec0f304619ca0b
tree221175ccfb7ed0cda9b33bdb533b34c2d5166102
parent922000d38a6e90c525328b381f04fea1244f616f
parent8ef377d76b721f2f62ca30a073fcfd312c155e95
Merge commit 'origin/gallium-0.1'

Conflicts:

src/gallium/auxiliary/draw/draw_vs_aos.c
src/gallium/auxiliary/draw/draw_vs_aos.c