projects
/
platform
/
upstream
/
glslang.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8e3f4c2
5dc8a76
)
Merge pull request #188 from bsalomon/master
author
John Kessenich
<johnkslang@users.noreply.github.com>
Fri, 4 Mar 2016 04:57:51 +0000
(21:57 -0700)
committer
John Kessenich
<johnkslang@users.noreply.github.com>
Fri, 4 Mar 2016 04:57:51 +0000
(21:57 -0700)
Fix line endings in Test/100.conf
Trivial merge