resolve merge conflicts of 297d0b5c to deqp-dev
[platform/upstream/VK-GL-CTS.git] / framework / common / tcuFactoryRegistry.hpp
2014-09-10 Jarkko PoyryImport dEQP.