resolve merge conflicts of a9ffcc1 to master
[platform/upstream/VK-GL-CTS.git] / doc / qpa_file_format.txt
2014-09-10 Jarkko PoyryImport dEQP.