summaryrefslogtreecommitdiffstats
path: root/src/plugins/imageformats/jpeg
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-091-0/+4
|\
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-293-6/+6
| |\
| * | Fix warnings because of unused variables.axis2009-06-291-0/+4
* | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-303-6/+6
|\ \ \
| * \ \ Merge license header changes from 4.5Volker Hilsheimer2009-06-163-6/+6
| |\ \ \ | | | |/ | | |/|
| | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-163-6/+6
| | * | Long live Qt 4.5!Lars Knoll2009-03-234-0/+1509
| | /
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-1/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Fix floating point exception in QImageReader::setScaledSize(QSize(0, 0))Leonardo Sobral Cunha2009-06-091-1/+2
| * Long live Qt!Lars Knoll2009-03-234-0/+1509
* Long live Qt for S60!axis2009-04-244-0/+1511