diff options
| author | Alex <qt-info@nokia.com> | 2010-05-06 09:29:55 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2010-05-06 09:29:55 +1000 |
| commit | cbfe7d79145890ef1eed7b7394c2cfdecd59bb9b (patch) | |
| tree | efc2605b3324359de9b6b7fe01a3c2c919488e23 /doc/src/snippets/sensors/creating.cpp | |
| parent | a89412293b9207e6c80d3e34fbce712cc1c4b5b6 (diff) | |
| parent | f9d2e1e6375812fbd33b24e80a389e19b745b13b (diff) | |
Merge branch '1.0' of ../qtm-serviceframework into 1.0
Conflicts:
doc/html/contactsengines.html
Diffstat (limited to 'doc/src/snippets/sensors/creating.cpp')
0 files changed, 0 insertions, 0 deletions