Merge remote-tracking branch 'upstream/master'
authorJohannes van Waveren <janpaul.vanwaveren@oculus.com>
Fri, 21 Oct 2016 08:21:46 +0000 (17:21 +0900)
committerJohannes van Waveren <janpaul.vanwaveren@oculus.com>
Fri, 21 Oct 2016 08:21:46 +0000 (17:21 +0900)
commit2f4c832d47ca4faf0cfbeb943999e59453a6f863
treeb021c8a63bf933c20922d63ef131767e4e4bdc4a
parent8e1e717cae690e789c975b914a33f346e97799d3
parent3fc1543794d1c368d690e60eaac6111c8c436aa7
Merge remote-tracking branch 'upstream/master'
glslang/Include/Common.h
glslang/Include/intermediate.h