summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-03 15:51:20 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-03 15:51:20 (GMT)
commitd6c9b45f5979d6b99b1078db38d6ae402fb4332c (patch)
tree08848e52e49acf706498a1c5031c44eb23f4998f /src/3rdparty
parent98ce026af9e1fcdc9ae68a2757d102c9093c023c (diff)
parent7f6fe4bc968763d50c4b1d61017f9a45927250e9 (diff)
downloadQt-d6c9b45f5979d6b99b1078db38d6ae402fb4332c.zip
Qt-d6c9b45f5979d6b99b1078db38d6ae402fb4332c.tar.gz
Qt-d6c9b45f5979d6b99b1078db38d6ae402fb4332c.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: [plugins] Don't conclude that a .debug file is a plugin.
Diffstat (limited to 'src/3rdparty')
0 files changed, 0 insertions, 0 deletions