summaryrefslogtreecommitdiffstats
path: root/examples/richtext/syntaxhighlighter
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-305-10/+10
|\
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-165-10/+10
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-165-10/+10
| | * Long live Qt 4.5!Lars Knoll2009-03-236-0/+509
* | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-6/+5
|\ \ | |/
| * Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-121-6/+5
| * Long live Qt!Lars Knoll2009-03-236-0/+509
* Long live Qt for S60!axis2009-04-246-0/+511