projects / platform / upstream / VK-GL-CTS.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 296bd3a) | patch
Remove merge conflicts artefacts
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 19 Sep 2017 15:24:50 +0000 (10:24 -0500)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 19 Sep 2017 15:24:54 +0000 (10:24 -0500)
commitce94ca57a7fe83f9291e15254233b1bc76d4310c
tree11ebab66f76e0f1e1abdeb1eb9eb6d61c7fb614dtree | snapshot
parent296bd3ac6600768d59f8fc045d7a2f4abfd0c707commit | diff
Remove merge conflicts artefacts

vulkan.h.in has some merge conflicts artefacts.
This change removes them.

Components: Vulkan

VK-GL-CTS issue: 699

Change-Id: Ic9a72583f1d082e69a26a67e7e1306040cac0453
external/vulkancts/scripts/src/vulkan.h.in diff | blob | history
Domain: Graphics System / GL;