summaryrefslogtreecommitdiffstats
path: root/tests/auto/qfontcombobox
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-21 08:34:21 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-21 08:34:21 (GMT)
commit2181a341839b72a627a7ef641de58d1d2411f123 (patch)
treec2b02c1c9136fa7ac38071b90d9398979aa450e1 /tests/auto/qfontcombobox
parent9a099b6408169b3e6f30ffd2e4866d7af31e49c9 (diff)
parent627a80020e460e844720f19d07dde9c168b500fc (diff)
downloadQt-2181a341839b72a627a7ef641de58d1d2411f123.zip
Qt-2181a341839b72a627a7ef641de58d1d2411f123.tar.gz
Qt-2181a341839b72a627a7ef641de58d1d2411f123.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 'tests/auto/qfontcombobox')
0 files changed, 0 insertions, 0 deletions