diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-27 13:03:12 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-27 13:03:12 +1000 |
| commit | db5f67926ebb5430cc75d00a8d39614c9ce5cda0 (patch) | |
| tree | 23b37e6aa6106a849db2dbbbb4e25e8726801663 /src/phonon/phonon.pro | |
| parent | 52364069b83cd95c73f06973cd4eaadec63083e4 (diff) | |
| parent | 548f80552beb86e5f3218ded6ad7583c6660c91d (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging:
tests: mark tst_mediaobject as unstable
Diffstat (limited to 'src/phonon/phonon.pro')
0 files changed, 0 insertions, 0 deletions