diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2010-06-09 11:55:18 +1000 |
|---|---|---|
| committer | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2010-06-09 12:02:23 +1000 |
| commit | f351ecb1f6e7040cf840c1d1793300fa34d3aa6a (patch) | |
| tree | bea8a485b150ef2209ee436abe593bc86188b18a /doc/src/snippets/service-snippets/filemanagerplugin.h | |
| parent | 006090e5574f0e5465c410b0af1df90401b89921 (diff) | |
| parent | e15c3b9eaf47ca4f7206673daae24ef07b95691e (diff) | |
Merge branch 'sensors_1.0' into sensors_master
Conflicts:
doc/html/battery-charge-battery-subscriber-battery-subscriber-pro.html
doc/html/battery-charge-battery-subscriber-battery-subscriber-qrc.html
doc/html/qmlcontacts-qmlcontact-cpp.html
doc/html/qmlcontacts-qmlcontactmodel-h.html
doc/html/qmlcontacts-qmlcontacts-cpp.html
doc/html/qmlcontacts-qmlcontactsa-h.html
plugins/sensors/symbian/accelerometersym.cpp
plugins/sensors/symbian/sensorbackendsym.cpp
Diffstat (limited to 'doc/src/snippets/service-snippets/filemanagerplugin.h')
0 files changed, 0 insertions, 0 deletions