Module: Mesa Branch: master Commit: a4b6b428855e73b35f754a9f64647c6edc1a88fa URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a4b6b428855e73b35f754a9f64647c6edc1a88fa Author: Ian Romanick <ian.d.romanick at intel.com> Date: Mon Dec 21 18:45:31 2009 -0800 Merge branch 'mesa_7_7_branch' Conflicts: src/mesa/main/version.h ---