diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-07 01:33:56 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-07 01:33:56 +1000 |
| commit | 59082eb472c5c557c283c1da5af89df0d549f09e (patch) | |
| tree | c2045e5d5d5440437ad0ec00f3f5dc6a10893d52 /doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | |
| parent | 5c6d4b73f097ef6a736cb4a9bfdf47429ee7eea8 (diff) | |
| parent | 3fc965dcb4728e0a69659151fa4da2c19d4a956a (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-publishsubscribe into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-publishsubscribe:
Fix automatic merging by temporarily adding changes done on Fix1455.
Revert "Implementing 1455 - Enhanced Mobility Publish and Subscribe API backend"
Diffstat (limited to 'doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp')
0 files changed, 0 insertions, 0 deletions