summaryrefslogtreecommitdiffstats
path: root/tools/linguist/lupdate/merge.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.5'Thiago Macieira2009-03-271-2/+2
* Long live Qt!Lars Knoll2009-03-231-0/+505