aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/api/testdata/rule-conflict
Commit message (Expand)AuthorAgeFilesLines
* Remove the base module import from most test data projectsJoerg Bornemann2018-06-221-2/+0
* Cpp module: Default value for use*PrecompiledHeader is now trueChristian Kandeler2017-07-051-1/+0
* Update license headersIikka Eklund2016-08-291-0/+28
* Update license headersIikka Eklund2016-08-292-0/+54
* Merge 1.5 into master.Christian Kandeler2016-05-271-0/+1
* Add an additional check when applying rules.Christian Kandeler2016-03-214-0/+11