Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge license header changes from 4.5 | Volker Hilsheimer | 2009-06-16 | 3 | -18/+37 | |
|\ \ | |/ | ||||||
| * | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 2 | -16/+37 | |
| | | | | | | | | Reviewed-by: Trust Me | |||||
| * | remove pointless pris | Oswald Buddenhagen | 2009-06-15 | 1 | -2/+0 | |
| | | ||||||
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-04-02 | 1 | -13/+2 | |
|\ \ | |/ | | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp | |||||
| * | duplicate message handling improvements | Oswald Buddenhagen | 2009-04-02 | 1 | -13/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - lrelease will not abort on duplicates any more - lconvert now gets noisy, but only if messages within one file are duplicated (combining files with identical messages is ok) - lupdate stays silent, but will eliminate duplicates again - consolidate handling of dual-encoded and duplicate messages - for performance - instead of the format loader, now the app is responsible for calling the duplicate handler. this allows for the fine-grained control necessary for optimal performance. Task-number: 247738 | |||||
| * | Long live Qt 4.5! | Lars Knoll | 2009-03-23 | 3 | -0/+393 | |
| | ||||||
* | Long live Qt! | Lars Knoll | 2009-03-23 | 3 | -0/+392 | |