| commit | ec76cbbaaab57ecda6e56da42f109d23deab559b | [log] [tgz] |
|---|---|---|
| author | Eric Beckmann <ecbeckmann@google.com> | Wed Jul 26 00:25:12 2017 +0000 |
| committer | Eric Beckmann <ecbeckmann@google.com> | Wed Jul 26 00:25:12 2017 +0000 |
| tree | 9dab7959ea610924142e89066b61964b3495cc6f | |
| parent | 1778f81efa126dcde36a08ceeb080bfa618f667c [diff] |
Reapply "llvm-mt: implement simple merging of manifests, not factoring namespaces. This time with correct #if. This reverts commit 9cf4eca0e0383040c1ff1416815c7f649650c2a0. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@309064 91177308-0d34-0410-b5e6-96231b3b80d8