Merge pull request #175 from rdb/master

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

Sun, 28 Feb 2016 04:29:14 +0000 (21:29 -0700)

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

Sun, 28 Feb 2016 04:29:14 +0000 (21:29 -0700)
author John Kessenich <johnkslang@users.noreply.github.com>
Sun, 28 Feb 2016 04:29:14 +0000 (21:29 -0700)
committer John Kessenich <johnkslang@users.noreply.github.com>
Sun, 28 Feb 2016 04:29:14 +0000 (21:29 -0700)
diff --cc SPIRV/GlslangToSpv.cpp
Simple merge
diff --cc SPIRV/SpvBuilder.cpp

index 74ed611,aee4d32..d7f6fc7

mode 100644,100755..100644
--- 1/SPIRV/SpvBuilder.cpp
--- 2/SPIRV/SpvBuilder.cpp
+++ b/SPIRV/SpvBuilder.cpp
diff --cc StandAlone/StandAlone.cpp
Simple merge
diff --cc glslang/MachineIndependent/intermOut.cpp
Simple merge
author	John Kessenich <johnkslang@users.noreply.github.com>
	Sun, 28 Feb 2016 04:29:14 +0000 (21:29 -0700)
committer	John Kessenich <johnkslang@users.noreply.github.com>
	Sun, 28 Feb 2016 04:29:14 +0000 (21:29 -0700)
		1	2
SPIRV/GlslangToSpv.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
SPIRV/SpvBuilder.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
StandAlone/StandAlone.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
glslang/MachineIndependent/intermOut.cpp	patch \|	diff1 \|	diff2 \|	blob \| history