Merge remote-tracking branch 'public/master' into vulkan
authorJason Ekstrand <jason.ekstrand@intel.com>
Fri, 15 Apr 2016 20:34:04 +0000 (13:34 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Fri, 15 Apr 2016 20:35:16 +0000 (13:35 -0700)
1  2 
configure.ac

diff --cc configure.ac
Simple merge