summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-01 13:09:51 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-01 13:09:51 (GMT)
commit8feb69b5b59aa697793c377cc79afd9e873e2d6d (patch)
tree6d94713fd2f7d22c16fc0acfcc8f01e96b5c1759 /src/corelib/tools
parentf2625271f7c878c00fea38291cd11c34c80550fa (diff)
parent3e287de62f677dd0a88d2fa9299059025f2db546 (diff)
downloadQt-8feb69b5b59aa697793c377cc79afd9e873e2d6d.zip
Qt-8feb69b5b59aa697793c377cc79afd9e873e2d6d.tar.gz
Qt-8feb69b5b59aa697793c377cc79afd9e873e2d6d.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix crash in the fileiconprovider for Windows
Diffstat (limited to 'src/corelib/tools')
0 files changed, 0 insertions, 0 deletions