aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* core: warn when merged units have conflicting dependenciesZbigniew Jędrzejewski-Szmek2014-08-071-0/+1