diff options
| author | Peter Yard <peter.yard@nokia.com> | 2010-06-04 11:47:57 +1000 |
|---|---|---|
| committer | Peter Yard <peter.yard@nokia.com> | 2010-06-04 11:47:57 +1000 |
| commit | 5d7bab66dd1d632c1ef8abaf17d5f1cc50a8dbe8 (patch) | |
| tree | 6f6fe2a57de8dd48cffbdf0257ca5c03e1da4d1f /doc/src/snippets/sysinfo-snippets/dialog.cpp | |
| parent | a9827f7f6ce4c77c1acbb5dc3f3341cba0a25702 (diff) | |
| parent | 1c727556f82ccf95c46942161d4b588d4fa1b542 (diff) | |
Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework into 1.0 Fix merge conflicts.
Conflicts:
doc/html/index.html
doc/html/qtmobility-known-issues.html
doc/src/qtmobility-known-issues.qdoc
Diffstat (limited to 'doc/src/snippets/sysinfo-snippets/dialog.cpp')
0 files changed, 0 insertions, 0 deletions