summaryrefslogtreecommitdiff
path: root/test/integration/test-bug-747261-arch-specific-conflicts
AgeCommit message (Expand)Author
2014-06-12(try to) fix travis-ci build failuresDavid Kalnischkies
2014-06-12add an additional test for arch specific conflictsDavid Kalnischkies