Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
authorIan Romanick <ian.d.romanick@intel.com>
Mon, 28 Sep 2009 19:02:39 +0000 (12:02 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Mon, 28 Sep 2009 19:02:39 +0000 (12:02 -0700)
commitd39fd9f641df7da77ff6158c5aa249dd90bf420d
treec84a2c870a4e99e59e46464472558efb81865e57
parent86cd188f94c80767b81908e4ae9b6002f1396196
parent18f3afbe889357c5d3a0e257c4caba21f23945bb
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

Conflicts:
src/mesa/main/version.h