diff options
| author | Alex <qt-info@nokia.com> | 2010-04-27 15:36:32 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2010-04-27 15:36:32 +1000 |
| commit | b69aaab7bfbed1c682bae391b5361fdd65197ae0 (patch) | |
| tree | 518c9bc9b71874fd5803e060f10a5724f9c6d211 /examples/notesmanagerplugin/notesmanagerplugin.cpp | |
| parent | f609118f9029ef920249b473147969c357901271 (diff) | |
| parent | df367ae74a2c4ac029debe370cd566f7caaa140d (diff) | |
Merge branch '1.0' of ../qtmobility into 1.0
Conflicts:
doc/html/sensors-api.html
doc/src/index.qdoc
doc/src/sensors.qdoc
src/sensors/qsensorpluginloader.cpp
Diffstat (limited to 'examples/notesmanagerplugin/notesmanagerplugin.cpp')
0 files changed, 0 insertions, 0 deletions