Merge branch 'mesa_7_6_branch'
authorBrian Paul <brianp@vmware.com>
Fri, 25 Sep 2009 15:00:19 +0000 (09:00 -0600)
committerBrian Paul <brianp@vmware.com>
Fri, 25 Sep 2009 15:00:19 +0000 (09:00 -0600)
commitecf3091cc78638919f1977ccc0307c51b6731385
treee8dca04db94ce566f3dadf148236b5a4d0c901cb
parent5f4f7ad965c40327f16297606ed4f425598bfc2c
parent46da1f2c9b67e3b4c3659f2d029140b639571407
Merge branch 'mesa_7_6_branch'

Conflicts:

src/mesa/drivers/dri/intel/intel_clear.c
src/mesa/drivers/dri/intel/intel_clear.c