Merge branch 'i965g-restart'
authorKeith Whitwell <keithw@vmware.com>
Tue, 22 Dec 2009 09:40:39 +0000 (09:40 +0000)
committerKeith Whitwell <keithw@vmware.com>
Tue, 22 Dec 2009 09:40:39 +0000 (09:40 +0000)
commitaa02683e45f1eaf61bba2ba7eeda7686efeed2ca
tree63e0ef2fa85e5d7ebd6ffc6ae9043ce0819251a2
parentebbc73d1aed283c9bc4aa2b37bed4374bbaec5b5
parent0fc4dd3819af252c028ed43bbd668b4f34104e32
Merge branch 'i965g-restart'

Conflicts:
configure.ac
Makefile
SConstruct
configs/default
configure.ac
src/gallium/auxiliary/util/u_debug.c
src/gallium/auxiliary/util/u_math.h
src/mesa/state_tracker/st_draw.c