tree 8c31690c89bdf0b16fedd5a2db26c49048824559
parent f8e2c06cea1548c437761cb65cfbf97d50a057a7
author Douglas Gregor <dgregor@apple.com> 1363813835 +0000
committer Douglas Gregor <dgregor@apple.com> 1363813835 +0000

<rdar://problem/12368093> Extend module maps with a 'conflict' declaration, and warn when a newly-imported module conflicts with an already-imported module.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@177577 91177308-0d34-0410-b5e6-96231b3b80d8