Merge commit 'origin/gallium-0.1' into gallium-0.2
authorKeith Whitwell <keith@tungstengraphics.com>
Wed, 15 Oct 2008 16:20:30 +0000 (17:20 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Wed, 15 Oct 2008 16:20:30 +0000 (17:20 +0100)
commitcf85e413ad7672c1cef73215222ca1caa8e48b30
treef6c22fe6664f2512a06653768ca27b17d2294134
parentd533a5d00ae2d0669e9da41718ee847de0c343aa
parent055d986efefa310d6ffd1106e565ca2f5964159a
Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

src/mesa/main/context.c
progs/trivial/Makefile
src/mesa/main/context.c
src/mesa/main/ffvertex_prog.c
src/mesa/main/mtypes.h
src/mesa/main/state.c
src/mesa/main/texenvprogram.c