Merge vk-gl-cts/opengl-es-cts-3.2.3 into vk-gl-cts/master

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

Tue, 11 Jul 2017 09:39:46 +0000 (11:39 +0200)

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

Tue, 11 Jul 2017 09:39:46 +0000 (11:39 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Tue, 11 Jul 2017 09:39:46 +0000 (11:39 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Tue, 11 Jul 2017 09:39:46 +0000 (11:39 +0200)
diff --cc external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.cpp
Simple merge
diff --cc external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.hpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 11 Jul 2017 09:39:46 +0000 (11:39 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 11 Jul 2017 09:39:46 +0000 (11:39 +0200)
		1	2
external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/openglcts/modules/gl/gl4cEnhancedLayoutsTests.hpp	patch \|	diff1 \|	diff2 \|	blob \| history