diff options
| author | Don Sanders <don.sanders@nokia.com> | 2011-06-08 17:55:13 +1000 |
|---|---|---|
| committer | Don Sanders <don.sanders@nokia.com> | 2011-06-08 17:55:13 +1000 |
| commit | 67ab10caa8f8249cc2e961dfe439dd815293013e (patch) | |
| tree | f20b2334ba164dedfd19abca323370f914d0ceed /doc/src/snippets/sensors/plugin.cpp | |
| parent | f6ed41adb1e2d0592c12ab5a99b3acc7dfdd2904 (diff) | |
| parent | 421aafa6dccf3d97c8bb37bb37ba35c8c749e424 (diff) | |
Merge scm.dev.nokia.troll.no:qtmobility/qtmobility
Conflicts:
src/messaging/qmessage.cpp
src/messaging/qmessageservice.cpp
src/messaging/telepathyengine_maemo6_p.h
Diffstat (limited to 'doc/src/snippets/sensors/plugin.cpp')
0 files changed, 0 insertions, 0 deletions