diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2010-07-02 16:09:53 +1000 |
|---|---|---|
| committer | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2010-07-02 16:09:53 +1000 |
| commit | 0ddb8ab070d9443c2352c6b8ada9da3d3f54e63c (patch) | |
| tree | 49b58698bfe5e6c8e732ae3e80d80ff14280d73e /doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp | |
| parent | 1a564e7ded75f4e8af32031dea04c0496edf9e0d (diff) | |
| parent | 6a41a63bbd20e7a1680bcc906eec1950ecc997b4 (diff) | |
Merge branch 'sensors_1.0' into main_1.0
Conflicts:
plugins/declarative/sensors/sensors.pro
Diffstat (limited to 'doc/src/snippets/qtversitdocsample/qtversitdocsample.cpp')
0 files changed, 0 insertions, 0 deletions