summaryrefslogtreecommitdiffstats
path: root/tools/linguist/lupdate/merge.cpp
Commit message (Expand)AuthorAgeFilesLines
* Update license headers again.Jason McDonald2009-09-091-4/+4
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
* Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
* Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
* improved string operations all over the placeThierry Bastian2009-05-281-3/+3
* Merge branch '4.5'Thiago Macieira2009-03-271-2/+2
* Long live Qt!Lars Knoll2009-03-231-0/+505