Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/master

author Alexander Galazin <alexander.galazin@arm.com>

Tue, 27 Aug 2019 09:23:35 +0000 (11:23 +0200)

committer Alexander Galazin <alexander.galazin@arm.com>

Tue, 27 Aug 2019 09:23:35 +0000 (11:23 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Tue, 27 Aug 2019 09:23:35 +0000 (11:23 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Tue, 27 Aug 2019 09:23:35 +0000 (11:23 +0200)
diff --cc external/vulkancts/framework/vulkan/vkVulkan_c.inl
Simple merge
diff --cc external/vulkancts/scripts/src/vulkan_core.h

index 94e1899,7f3548b..c00e6e3

mode 100644,100755..100644
--- 1/external/vulkancts/scripts/src/vulkan_core.h
--- 2/external/vulkancts/scripts/src/vulkan_core.h
+++ b/external/vulkancts/scripts/src/vulkan_core.h
author	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 27 Aug 2019 09:23:35 +0000 (11:23 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 27 Aug 2019 09:23:35 +0000 (11:23 +0200)
		1	2
external/vulkancts/framework/vulkan/vkVulkan_c.inl	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/scripts/src/vulkan_core.h	patch \|	diff1 \|	diff2 \|	blob \| history