| commit | a0d8f62744c1d077e6631da32c28c1d2e2ef80bf | [log] [tgz] |
|---|---|---|
| author | Alon Zakai <alonzakai@gmail.com> | Mon Dec 29 21:10:27 2014 |
| committer | Alon Zakai <alonzakai@gmail.com> | Thu Jan 01 00:55:46 2015 |
| tree | 3dcdceefc80b8b26ed1a2b5aa4fe3f460b3953f7 | |
| parent | 30fe3050d1e787ff6f74629b237278d902858dce [diff] | |
| parent | ea86293b0aae2ab43e317256fe042225209de6a0 [diff] |
Merge commit 'ea86293b0aae2ab43e317256fe042225209de6a0' into merge-pnacl-3.5 This merges in PNaCl's clang 3.5. 1.28.3 Conflicts: lib/AST/ASTContext.cpp lib/Driver/Driver.cpp