| commit | cfcc055bc6f64e901d2de67d89b497466bb7ea07 | [log] [tgz] |
|---|---|---|
| author | Alon Zakai <[email protected]> | Wed Nov 04 18:31:46 2015 |
| committer | Alon Zakai <[email protected]> | Wed Nov 04 18:31:46 2015 |
| tree | f3bdb0042ef04287ba4f5e0ad4b0d4f5ca879147 | |
| parent | e7f43ea69b5ef34a3c294c15e936a1dcf52ccc7e [diff] | |
| parent | 0f541a4da9ff2b344f02f6634a7276bd2d00a6c5 [diff] |
Merge remote-tracking branch 'llvm/master' into to-llvm-trunk Conflicts: include/clang/Basic/TargetCXXABI.h lib/AST/ASTContext.cpp lib/CodeGen/CodeGenModule.cpp lib/CodeGen/ItaniumCXXABI.cpp test/CodeGen/target-data.c test/CodeGenCXX/member-function-pointers.cpp