summaryrefslogtreecommitdiffstats
path: root/tests/auto/linguist/lupdate/testdata/good/merge_versions
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-131-1/+1
|\
| * Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* | don't use qmake for test setupOswald Buddenhagen2010-01-061-8/+0
* | tidy up the test .pro filesOswald Buddenhagen2010-01-061-4/+1
|/
* Update license headers again.Jason McDonald2009-09-091-4/+4
* Update license headers.Jason McDonald2009-09-021-5/+33
* integrate linguist tool autotests into the qt testsuiteOswald Buddenhagen2009-06-304-0/+87