summaryrefslogtreecommitdiffstats
path: root/test/Modules/conflicts.m
Commit message (Expand)AuthorAgeFilesLines
* [modules] Simplify -cc1 interface for enabling implicit module maps.Richard Smith2015-06-161-1/+1
* <rdar://problem/12368093> Extend module maps with a 'conflict' declaration, a...Douglas Gregor2013-03-201-0/+7