Merge branch 'cpp-headers'

diff --cc glslang/Include/Common.h
Simple merge

diff --cc glslang/Include/PoolAlloc.h
Simple merge

diff --cc glslang/Include/revision.h
index b0cb64c,aba5e58..5bc8c9d
--- 1/glslang/Include/revision.h
--- 2/glslang/Include/revision.h
+++ b/glslang/Include/revision.h
@@@ -2,5 -2,5 +2,5 @@@
  // For the version, it uses the latest git tag followed by the number of commits.
  // For the date, it uses the current date (when then script is run).
  
- #define GLSLANG_REVISION "SPIRV99.1396"
- #define GLSLANG_DATE "09-Aug-2016"
 -#define GLSLANG_REVISION "SPIRV99.1384"
 -#define GLSLANG_DATE "05-Aug-2016"
++#define GLSLANG_REVISION "SPIRV99.1401"
++#define GLSLANG_DATE "11-Aug-2016"

diff --cc glslang/MachineIndependent/Intermediate.cpp
Simple merge

diff --cc glslang/MachineIndependent/ParseHelper.cpp
Simple merge

diff --cc glslang/MachineIndependent/ShaderLang.cpp
Simple merge

diff --cc glslang/OSDependent/Windows/ossource.cpp
Simple merge

diff --cc gtests/TestFixture.h
Simple merge

diff --cc hlsl/hlslParseHelper.cpp
Simple merge