summaryrefslogtreecommitdiffstats
path: root/tools/linguist/lupdate/merge.cpp
Commit message (Collapse)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
| | | | | used character operations whenever possible better usage of QLatin1String
* Merge branch '4.5'Thiago Macieira2009-03-271-2/+2
| | | | | | | | | | Conflicts: tools/linguist/lupdate/qscript.cpp tools/linguist/lupdate/qscript.g tools/linguist/lupdate/ui.cpp tools/linguist/shared/cpp.cpp tools/linguist/shared/qph.cpp tools/linguist/shared/translator.h
* Long live Qt!Lars Knoll2009-03-231-0/+505