summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmargins
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-09-20 09:50:55 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-09-20 09:50:55 (GMT)
commita55e82b3525d6fee5d4e50441c6d268c23d24c40 (patch)
tree14455a68e4793a7e93784a0335dbca5846370b9d /tests/auto/qmargins
parentff2e670f24f4d1c011e26745dc28e6f7187656b5 (diff)
parentfa717293080c9d00b02028bebece1935aef6e093 (diff)
downloadQt-a55e82b3525d6fee5d4e50441c6d268c23d24c40.zip
Qt-a55e82b3525d6fee5d4e50441c6d268c23d24c40.tar.gz
Qt-a55e82b3525d6fee5d4e50441c6d268c23d24c40.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Avoid runtime warning about interlace handling from libpng 1.5
Diffstat (limited to 'tests/auto/qmargins')
0 files changed, 0 insertions, 0 deletions