summaryrefslogtreecommitdiffstats
path: root/tests/auto/qpluginloader/tst/tst.pro
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-05-11 06:30:34 (GMT)
committeraxis <qt-info@nokia.com>2009-05-11 06:30:34 (GMT)
commit804a0ff4ad8c27ece2d403b8d9a4f6f65cdcf867 (patch)
tree0258fb5f685ccaa710f8ea8ec9da9b6aa9f91d35 /tests/auto/qpluginloader/tst/tst.pro
parentefb3e7288eec748db11c35de87239a1eff4d457c (diff)
parent842ba1b3878c2973b24936b18a7ee55bdd980be6 (diff)
downloadQt-804a0ff4ad8c27ece2d403b8d9a4f6f65cdcf867.zip
Qt-804a0ff4ad8c27ece2d403b8d9a4f6f65cdcf867.tar.gz
Qt-804a0ff4ad8c27ece2d403b8d9a4f6f65cdcf867.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts: tests/auto/qtemporaryfile/qtemporaryfile.pro
Diffstat (limited to 'tests/auto/qpluginloader/tst/tst.pro')
0 files changed, 0 insertions, 0 deletions