summaryrefslogtreecommitdiffstats
path: root/demos/chip
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
| | * Long live Qt 4.5!Lars Knoll2009-03-2315-0/+831
* | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-8/+9
|\ \ | |/
| * Graphics View Optimization: Use a simple style option by default.Bjoern Erik Nilsen2009-05-151-8/+9
| * Long live Qt!Lars Knoll2009-03-2315-0/+831
* Long live Qt for S60!axis2009-04-2415-0/+833