diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2010-05-18 10:40:02 +1000 |
|---|---|---|
| committer | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2010-05-18 10:40:02 +1000 |
| commit | 13f6c7dc36be1dbb851c413dbdf7357852384d87 (patch) | |
| tree | 1a95469679fc03cd9dbcfd48e0c6579b7127b38c /doc/src/snippets/sysinfo-snippets/main.cpp | |
| parent | 06809082eca1d1fff143d32126463dc7924cc16a (diff) | |
| parent | 46208e63fccce8d0896bb700d0e77467d19d5f92 (diff) | |
Merge branch 'main_master' into sensors_master
Conflicts:
plugins/sensors/maemo6/maemo6.pro
plugins/sensors/sensors.pro
Diffstat (limited to 'doc/src/snippets/sysinfo-snippets/main.cpp')
0 files changed, 0 insertions, 0 deletions