diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-23 22:52:56 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-23 22:52:56 +1000 |
| commit | 42271f48d48c2f41b9fefd9ef4414d5b0b2444f0 (patch) | |
| tree | e99708b0603d35b053dae3f775087c68e11007db /tests/auto/mediaobject/dummy/mediaobject.h | |
| parent | 8b6f14dd619e4eb7ab041c9324a4ece43d5dd398 (diff) | |
| parent | 209efdb78eb62d5eed2f32934cb7f1efeede73e7 (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:
Squashed commit of changes from the 4.8-temp branch.
Squashed commit of the changes from the mobile-examples repository (4.7-generated-declarative branch). (cherry picked from commit 539311f7b2687e3148ea695ce06fee768abe7b44)
Diffstat (limited to 'tests/auto/mediaobject/dummy/mediaobject.h')
0 files changed, 0 insertions, 0 deletions