Merge vk-gl-cts/opengl-cts-4.6.0 into vk-gl-cts/master

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

Wed, 15 Nov 2017 14:46:11 +0000 (15:46 +0100)

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

Wed, 15 Nov 2017 14:46:11 +0000 (15:46 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Wed, 15 Nov 2017 14:46:11 +0000 (15:46 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Wed, 15 Nov 2017 14:46:11 +0000 (15:46 +0100)
diff --cc external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl40-master.txt
Simple merge
diff --cc external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl41-master.txt
Simple merge
diff --cc external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl42-master.txt
Simple merge
diff --cc external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt
Simple merge
diff --cc external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt
Simple merge
diff --cc external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt
Simple merge
diff --cc external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 15 Nov 2017 14:46:11 +0000 (15:46 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 15 Nov 2017 14:46:11 +0000 (15:46 +0100)
		1	2
external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl40-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl41-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl42-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl43-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl44-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl45-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/openglcts/data/mustpass/gl/khronos_mustpass/4.6.0.x/gl46-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history