diff options
| author | juhvu <qt-info@nokia.com> | 2010-01-15 09:54:06 +1000 |
|---|---|---|
| committer | juhvu <qt-info@nokia.com> | 2010-01-15 09:54:06 +1000 |
| commit | 01caa96f91b6c2abc8dd63328769fb00d627d6d0 (patch) | |
| tree | 9221ce08affd2cc8e68eaea23875c08af92e4012 /examples/notesmanagerplugin/notesmanagerplugin.cpp | |
| parent | 0ed9ad1385f972e8c4575b68049664d13a6c3aa2 (diff) | |
| parent | 851eba3e10cad89b230e7166825abc059bd753de (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework
Conflicts:
tests/auto/qservicemanager/tst_qservicemanager.cpp
Diffstat (limited to 'examples/notesmanagerplugin/notesmanagerplugin.cpp')
0 files changed, 0 insertions, 0 deletions