Merge pull request #1567 from Igalia/apinheiro/xfb-1535

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

Tue, 27 Nov 2018 14:17:10 +0000 (07:17 -0700)

committer GitHub <noreply@github.com>

Tue, 27 Nov 2018 14:17:10 +0000 (07:17 -0700)
author John Kessenich <johnkslang@users.noreply.github.com>
Tue, 27 Nov 2018 14:17:10 +0000 (07:17 -0700)
committer GitHub <noreply@github.com>
Tue, 27 Nov 2018 14:17:10 +0000 (07:17 -0700)
diff --cc glslang/MachineIndependent/ParseHelper.cpp
Simple merge
diff --cc gtests/Spv.FromFile.cpp

index efb8967,ee8cf00..66780f7

mode 100755,100644..100755
--- 1/gtests/Spv.FromFile.cpp
--- 2/gtests/Spv.FromFile.cpp
+++ b/gtests/Spv.FromFile.cpp
author	John Kessenich <johnkslang@users.noreply.github.com>
	Tue, 27 Nov 2018 14:17:10 +0000 (07:17 -0700)
committer	GitHub <noreply@github.com>
	Tue, 27 Nov 2018 14:17:10 +0000 (07:17 -0700)
		1	2
glslang/MachineIndependent/ParseHelper.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
gtests/Spv.FromFile.cpp	patch \|	diff1 \|	diff2 \|	blob \| history