summaryrefslogtreecommitdiffstats
path: root/examples/qtconcurrent/imagescaling
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-133-3/+3
|\
| * Update contact URL in license headers.Jason McDonald2009-08-123-3/+3
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-303-6/+6
|\ \ | |/
| * Update license headers as requested by the marketing department.Jason McDonald2009-06-163-6/+6
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-021-0/+2
|\ \ | |/
| * add deployment rules...Maurice Kalinowski2009-05-251-0/+2
| * Long live Qt 4.5!Lars Knoll2009-03-234-0/+306
* Long live Qt for S60!axis2009-04-244-0/+308