diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2010-03-10 10:57:01 +1000 |
|---|---|---|
| committer | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2010-03-10 10:57:01 +1000 |
| commit | 002d544cb064d46761078a9550b589b401f2a0b6 (patch) | |
| tree | 79aad9dff5f683c961a419a8ed62078e50c178fa /doc/src/snippets/sensors/plugin.cpp | |
| parent | 5318b085c4adcb8dbbf8502982407841d9d54c83 (diff) | |
| parent | 1b9e30685c61613fbbd31263a6ce9d7121bd4e89 (diff) | |
Merge commit '1b9e30685c61613fbbd31263a6ce9d7121bd4e89' into sensors
Conflicts:
configure.bat
doc/html/annotated.html
doc/html/classes.html
doc/html/functions.html
doc/html/qtmobility.qhp
doc/src/snippets/snippets.pro
Diffstat (limited to 'doc/src/snippets/sensors/plugin.cpp')
0 files changed, 0 insertions, 0 deletions