Merge pull request #2139 from neslimsah/master

author John Kessenich <johnkslang@users.noreply.github.com>

Wed, 25 Mar 2020 14:18:33 +0000 (08:18 -0600)

committer GitHub <noreply@github.com>

Wed, 25 Mar 2020 14:18:33 +0000 (08:18 -0600)
author John Kessenich <johnkslang@users.noreply.github.com>
Wed, 25 Mar 2020 14:18:33 +0000 (08:18 -0600)
committer GitHub <noreply@github.com>
Wed, 25 Mar 2020 14:18:33 +0000 (08:18 -0600)
diff --cc glslang/Include/Types.h
Simple merge
diff --cc glslang/MachineIndependent/intermOut.cpp
Simple merge
author	John Kessenich <johnkslang@users.noreply.github.com>
	Wed, 25 Mar 2020 14:18:33 +0000 (08:18 -0600)
committer	GitHub <noreply@github.com>
	Wed, 25 Mar 2020 14:18:33 +0000 (08:18 -0600)
		1	2
glslang/Include/Types.h	patch \|	diff1 \|	diff2 \|	blob \| history
glslang/MachineIndependent/intermOut.cpp	patch \|	diff1 \|	diff2 \|	blob \| history