projects / platform / upstream / glslang.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e1e717 3fc1543)
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)
1  2 
glslang/Include/Common.h patch | diff1 | diff2 | blob | history
glslang/Include/intermediate.h patch | diff1 | diff2 | blob | history

diff --cc glslang/Include/Common.h
Simple merge
diff --cc glslang/Include/intermediate.h
Simple merge
Domain: Graphics System / GL;