Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 1 Dec 2009 01:47:07 +0000 (17:47 -0800)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 1 Dec 2009 01:47:07 +0000 (17:47 -0800)
commit650e02003fbb5511ec758d993b7ec0a302ee2235
tree96ff849518962856e51b2e3a26b78ba008b2f9ad
parent270d36da146b899d39e08f830fe34b63833a3731
parent587a52e95bbe96788e8b96b63f091bb3022fc048
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
progs/util/shaderutil.c
src/mesa/drivers/dri/r600/r600_context.c
src/mesa/main/version.h
Makefile
progs/util/shaderutil.c
src/mesa/drivers/dri/i915/i915_context.h
src/mesa/drivers/dri/intel/intel_buffer_objects.c
src/mesa/main/compiler.h