projects
/
platform
/
upstream
/
glslang.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
845860d
b3e80f5
)
Merge pull request #1287 from eintw1ck/master
author
John Kessenich
<johnkslang@users.noreply.github.com>
Mon, 12 Mar 2018 18:39:00 +0000
(12:39 -0600)
committer
GitHub
<noreply@github.com>
Mon, 12 Mar 2018 18:39:00 +0000
(12:39 -0600)
include/Common.h: reorder includes to avoid redefinition on some platforms
Trivial merge