Merge branch 'mesa_7_7_branch'
authorIan Romanick <ian.d.romanick@intel.com>
Tue, 22 Dec 2009 02:45:31 +0000 (18:45 -0800)
committerIan Romanick <ian.d.romanick@intel.com>
Tue, 22 Dec 2009 02:45:31 +0000 (18:45 -0800)
commita4b6b428855e73b35f754a9f64647c6edc1a88fa
tree45422f07630a8f36264fe43d9d325305bf8085bd
parentef171051349ac83695a9a8304d486e1adb503291
parent82184970d3aee822d945af7d4902359f28f7057f
Merge branch 'mesa_7_7_branch'

Conflicts:
src/mesa/main/version.h
src/mesa/drivers/dri/intel/intel_context.c