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