Merge pull request #337 from steve-lunarg/intrinsics

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

Mon, 13 Jun 2016 14:54:45 +0000 (08:54 -0600)

committer GitHub <noreply@github.com>

Mon, 13 Jun 2016 14:54:45 +0000 (08:54 -0600)
author John Kessenich <johnkslang@users.noreply.github.com>
Mon, 13 Jun 2016 14:54:45 +0000 (08:54 -0600)
committer GitHub <noreply@github.com>
Mon, 13 Jun 2016 14:54:45 +0000 (08:54 -0600)
diff --cc hlsl/hlslParseHelper.cpp
Simple merge
diff --cc hlsl/hlslParseHelper.h
Simple merge
author	John Kessenich <johnkslang@users.noreply.github.com>
	Mon, 13 Jun 2016 14:54:45 +0000 (08:54 -0600)
committer	GitHub <noreply@github.com>
	Mon, 13 Jun 2016 14:54:45 +0000 (08:54 -0600)
		1	2
hlsl/hlslParseHelper.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
hlsl/hlslParseHelper.h	patch \|	diff1 \|	diff2 \|	blob \| history