Merge branch 'mesa_7_7_branch'

Conflicts:
	src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
	src/gallium/auxiliary/util/Makefile
	src/gallium/drivers/r300/r300_state_derived.c
This commit is contained in:
Jakob Bornecrantz
2010-01-14 22:31:04 +00:00
56 changed files with 182 additions and 233 deletions

View File

@@ -40,7 +40,6 @@
#include "shader/prog_statevars.h"
#include "shader/prog_execute.h"
#include "swrast/s_context.h"
#include "swrast/s_texfilter.h"
#include "tnl/tnl.h"
#include "tnl/t_context.h"