| commit | c8c6ac398edee5ef8147b0e137d174089a239717 | [log] [tgz] |
|---|---|---|
| author | Alon Zakai <[email protected]> | Wed Sep 02 17:37:08 2015 |
| committer | Alon Zakai <[email protected]> | Wed Sep 02 17:37:08 2015 |
| tree | b95269d8af43775c0f123cb9a6c77b1c57668734 | |
| parent | a79f2558be8cc0c86003bfdbe2710ae318f66191 [diff] | |
| parent | 83820ea5753a6307723cd92eee61fb50295cb410 [diff] |
Merge remote-tracking branch 'google-origin/master' into merge_37 Conflicts: tools/CMakeLists.txt tools/opt/Makefile tools/pnacl-llc/Makefile