Merge pull request #1656 from amdrexu/bugfix

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

Fri, 18 Jan 2019 04:53:34 +0000 (21:53 -0700)

committer GitHub <noreply@github.com>

Fri, 18 Jan 2019 04:53:34 +0000 (21:53 -0700)
author John Kessenich <johnkslang@users.noreply.github.com>
Fri, 18 Jan 2019 04:53:34 +0000 (21:53 -0700)
committer GitHub <noreply@github.com>
Fri, 18 Jan 2019 04:53:34 +0000 (21:53 -0700)
diff --cc glslang/MachineIndependent/ParseHelper.cpp
Simple merge
diff --cc hlsl/hlslParseHelper.cpp

index 6a5d4859dcb369de0c946cffa749bbc658475212,35f87211ef89ef4bca158cbe256e17147e387ea4..5069b32722f55e551f53c435c417f7c883a4e3a4

mode 100644,100755..100644
--- 1/hlsl/hlslParseHelper.cpp
--- 2/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
author	John Kessenich <johnkslang@users.noreply.github.com>
	Fri, 18 Jan 2019 04:53:34 +0000 (21:53 -0700)
committer	GitHub <noreply@github.com>
	Fri, 18 Jan 2019 04:53:34 +0000 (21:53 -0700)
		1	2
glslang/MachineIndependent/ParseHelper.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
hlsl/hlslParseHelper.cpp	patch \|	diff1 \|	diff2 \|	blob \| history