| commit | 5bcf6b22ba03872b68003d3c39030eb527131173 | [log] [tgz] |
|---|---|---|
| author | Alon Zakai <alonzakai@gmail.com> | Fri Mar 13 21:56:55 2015 |
| committer | Alon Zakai <alonzakai@gmail.com> | Fri Mar 13 21:56:55 2015 |
| tree | 6a245cb955622cf7c6d7acb8daafc33db6db61de | |
| parent | ee207e5caea72d5e6001551bc415960cb388c2cd [diff] | |
| parent | a46d3ebfd8f295a32e2dab6241d207e04302b483 [diff] |
Merge remote-tracking branch 'pnacl/master' into merge-pnacl-mar-13-2015 Conflicts: lib/Driver/ToolChains.h