resolve merge conflicts of eb48f49dd to oc-dev am: 7e37841e4f -s ours
[platform/upstream/VK-GL-CTS.git] / framework / referencerenderer / rrShaders.cpp
2014-09-10 Jarkko PoyryImport dEQP.