Merge commit 'origin/gallium-0.1' into gallium-0.2
authorAlan Hourihane <alanh@tungstengraphics.com>
Fri, 28 Nov 2008 16:18:36 +0000 (16:18 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Fri, 28 Nov 2008 16:18:36 +0000 (16:18 +0000)
commit5b714723895d321db753f896576de5e2c27778c3
tree9737208dbb6fc7ff63dfd899a3d36383da5ef5d3
parent823aac36d5580ea46f76ccec3fd31c91f168274e
parent158a5f75d8436facfe8163845a942979899213fe
Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

src/gallium/auxiliary/tgsi/tgsi_sse2.c
src/mesa/state_tracker/st_cb_bitmap.c