resolve merge conflicts of 037808f59 to oc-mr1-dev
[platform/upstream/VK-GL-CTS.git] / framework / qphelper / qpDebugOut.h
2014-09-10 Jarkko PoyryImport dEQP.