diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-20 23:54:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-20 23:54:46 (GMT) |
| commit | 627a80020e460e844720f19d07dde9c168b500fc (patch) | |
| tree | c2b02c1c9136fa7ac38071b90d9398979aa450e1 /src/corelib | |
| parent | 9a099b6408169b3e6f30ffd2e4866d7af31e49c9 (diff) | |
| parent | b3fb3713bd0118e0357bc95cf665c4e8bb6f978f (diff) | |
| download | Qt-627a80020e460e844720f19d07dde9c168b500fc.zip Qt-627a80020e460e844720f19d07dde9c168b500fc.tar.gz Qt-627a80020e460e844720f19d07dde9c168b500fc.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Compile fix for symbian
license doc updated for libtiff 3.9.2
Our configuration and build modifications to libtiff
Add libtiff 3.9.2
Update license doc, .pro file and qjpeghandler for libjpeg 8
Our configuration and build modifications to libjpeg
Add libjpeg 8
Delete libjpeg 6b
Delete libtiff 3.8.2
Diffstat (limited to 'src/corelib')
0 files changed, 0 insertions, 0 deletions