resolve merge conflicts of 76a147bf to deqp-dev
[platform/upstream/VK-GL-CTS.git] / LICENSE
2014-09-10 Jarkko PoyryImport dEQP.