summaryrefslogtreecommitdiffstats
path: root/examples/itemviews/puzzle
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-307-14/+14
|\
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-167-14/+14
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-167-14/+14
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-2/+2
|\ \ \ | |/ /
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-271-0/+5
| |\ \ | | |/
| * | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-121-2/+2
| * | Long live Qt!Lars Knoll2009-03-2310-0/+878
| /
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-021-0/+5
|\ \ | |/
| * add deployment rules...Maurice Kalinowski2009-05-251-0/+5
| * Long live Qt 4.5!Lars Knoll2009-03-2310-0/+878
* Long live Qt for S60!axis2009-04-2410-0/+880