Merge remote-tracking branch 'mesa-public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Wed, 26 Aug 2015 18:04:30 +0000 (11:04 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Wed, 26 Aug 2015 18:04:30 +0000 (11:04 -0700)
1  2 
configure.ac

diff --cc configure.ac
Simple merge