summaryrefslogtreecommitdiffstats
path: root/tests/auto/mediaobject
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-11 03:29:32 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-11 03:29:32 (GMT)
commite9e4fb8b15b5fd353a9728a76f5d528ec312ebb3 (patch)
tree99006bea4e4f220bee08cb1d289570b265643b7b /tests/auto/mediaobject
parent65f138ac6b8472ace226e769062f6aa92ebf9480 (diff)
parentad9a13225a92dbc90767f38f6eaa89808adde1c1 (diff)
downloadQt-e9e4fb8b15b5fd353a9728a76f5d528ec312ebb3.zip
Qt-e9e4fb8b15b5fd353a9728a76f5d528ec312ebb3.tar.gz
Qt-e9e4fb8b15b5fd353a9728a76f5d528ec312ebb3.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: Fix ConnMan bearer plugin to use new net.connman service name.
Diffstat (limited to 'tests/auto/mediaobject')
0 files changed, 0 insertions, 0 deletions