projects / platform / upstream / glslang.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e46eae 9f9bad0)
Merge pull request #2 from KhronosGroup/master
authordankbaker <dan.baker@oxideengineering.com>
Fri, 5 Aug 2016 18:55:44 +0000 (14:55 -0400)
committerGitHub <noreply@github.com>
Fri, 5 Aug 2016 18:55:44 +0000 (14:55 -0400)
Integrating Master into dankbaker fork


Trivial merge
Domain: Graphics System / GL;