summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-29 06:06:10 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-29 06:06:10 (GMT)
commit91f47c01fa2e17f93af34597b135f30cb157dada (patch)
tree1600eed7b732164b49a73dd966b63ac8ab9d2e52 /src
parent473da75ed84651c70ae0d10e23f09e1a0e4ae799 (diff)
parent51a444a789ff5f3ba72d3f817f4cdf427d2ff91d (diff)
downloadQt-91f47c01fa2e17f93af34597b135f30cb157dada.zip
Qt-91f47c01fa2e17f93af34597b135f30cb157dada.tar.gz
Qt-91f47c01fa2e17f93af34597b135f30cb157dada.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Use QSKIP rather than commenting a failure.
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions