resolve merge conflicts of eb48f49dd to oc-dev
[platform/upstream/VK-GL-CTS.git] / executor / xeXMLParser.hpp
2014-09-10 Jarkko PoyryImport dEQP.