resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214
[platform/upstream/VK-GL-CTS.git] / LICENSE
2014-09-10 Jarkko PoyryImport dEQP.