Merge commit 'origin/gallium-0.1' into gallium-0.2
authorAlan Hourihane <alanh@tungstengraphics.com>
Tue, 25 Nov 2008 09:28:30 +0000 (09:28 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Tue, 25 Nov 2008 09:28:30 +0000 (09:28 +0000)
commit4af0d940a35536f096a9289470af0268a79402b3
tree811a00ed03b1bcd5a99713108f831b41484153ff
parentc5b52b5e0e6f6e47c3953076fa788921b1c5a5e2
parent55839ae064d64b7fcc180fcddb364bf31ab760dc
Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

scons/gallium.py
src/gallium/auxiliary/pipebuffer/pb_buffer.h
src/gallium/auxiliary/pipebuffer/pb_buffer.h
src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c
src/gallium/auxiliary/pipebuffer/pb_bufmgr_mm.c
src/gallium/winsys/gdi/SConscript