Merge pull request #1547 from Igalia/apinheiro/xfb-struct-assignment

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

Fri, 9 Nov 2018 19:27:39 +0000 (12:27 -0700)

committer GitHub <noreply@github.com>

Fri, 9 Nov 2018 19:27:39 +0000 (12:27 -0700)
author John Kessenich <johnkslang@users.noreply.github.com>
Fri, 9 Nov 2018 19:27:39 +0000 (12:27 -0700)
committer GitHub <noreply@github.com>
Fri, 9 Nov 2018 19:27:39 +0000 (12:27 -0700)
diff --cc glslang/MachineIndependent/ParseHelper.cpp
Simple merge
diff --cc gtests/Spv.FromFile.cpp
Simple merge
author	John Kessenich <johnkslang@users.noreply.github.com>
	Fri, 9 Nov 2018 19:27:39 +0000 (12:27 -0700)
committer	GitHub <noreply@github.com>
	Fri, 9 Nov 2018 19:27:39 +0000 (12:27 -0700)
		1	2
glslang/MachineIndependent/ParseHelper.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
gtests/Spv.FromFile.cpp	patch \|	diff1 \|	diff2 \|	blob \| history