Merge commit 'origin/master' into i965g-restart
authorKeith Whitwell <keithw@vmware.com>
Mon, 21 Dec 2009 19:18:41 +0000 (19:18 +0000)
committerKeith Whitwell <keithw@vmware.com>
Mon, 21 Dec 2009 19:18:41 +0000 (19:18 +0000)
commita5585cb533af3d4e5d5324d5f526447b98597402
tree6706dbb8b4f994b919e247647c3e8853d067b45c
parentd288a30610767f87e3e7c069730d4bc255246568
parent574715d8368f99c0a5720a9676385d58d6cfdf30
Merge commit 'origin/master' into i965g-restart

Conflicts:
SConstruct
configs/default
configs/linux-dri
Makefile
SConstruct
configs/default
configs/linux-dri
configure.ac
progs/fp/fp-tri.c
progs/trivial/tri-orig.c
src/gallium/auxiliary/util/u_math.h
src/gallium/winsys/drm/SConscript
src/mesa/state_tracker/st_draw.c