diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-03 10:20:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-03 10:20:53 (GMT) |
| commit | 607c58619ffd29d76a640d73d757ac062d45a492 (patch) | |
| tree | 1e069c506c1c78e3c39eacc1848815f105380c9a /src/plugins | |
| parent | e50a39b7f15305bafe9208f4c87ea468f237124f (diff) | |
| parent | 9a18e5015489e238035f1f3328f755c826733bdf (diff) | |
| download | Qt-607c58619ffd29d76a640d73d757ac062d45a492.zip Qt-607c58619ffd29d76a640d73d757ac062d45a492.tar.gz Qt-607c58619ffd29d76a640d73d757ac062d45a492.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Remove obsolete patch file
Compilation fix for WinCE
Avoid runtime warning about interlace handling from libpng 1.5
Updating libpng: Patches to libpng for building it in Qt
Updating libpng: Add libpng version 1.5.1
Updating libpng: Remove version 1.4.0
Diffstat (limited to 'src/plugins')
0 files changed, 0 insertions, 0 deletions