resolve merge conflicts of 3ffc2f2 to master
[platform/upstream/VK-GL-CTS.git] / executor / xeTestCaseResult.cpp
2014-09-10 Jarkko PoyryImport dEQP.