summaryrefslogtreecommitdiffstats
path: root/tools/linguist/lupdate/merge.cpp
Commit message (Expand)AuthorAgeFilesLines
* 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