summaryrefslogtreecommitdiffstats
path: root/examples/richtext
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-3018-36/+36
|\
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-1618-36/+36
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1618-36/+36
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-252-9/+8
|\ \ \ | |/ /
| * | Merge commit 'origin/4.5'Olivier Goffart2009-06-041-0/+4
| |\ \ | | |/
| * | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-122-9/+8
| * | Long live Qt!Lars Knoll2009-03-2325-0/+2020
| /
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-081-0/+4
|\ \ | |/
| * missing deployment rule added to examples/richtext/textobjectJoerg Bornemann2009-06-021-0/+4
| * Long live Qt 4.5!Lars Knoll2009-03-2325-0/+2020
* Long live Qt for S60!axis2009-04-2425-0/+2028