resolve merge conflicts of a9ffcc1 to master
[platform/upstream/VK-GL-CTS.git] / LICENSE
2014-09-10 Jarkko PoyryImport dEQP.