diff options
| author | Alex <qt-info@nokia.com> | 2010-06-28 19:10:36 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2010-06-28 19:10:36 +1000 |
| commit | c005285cb0878d54df9e23ff9d2cab4cff660caf (patch) | |
| tree | f2c183ed4bfba2d95af05dff988bdd0448b56b0c /doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp | |
| parent | 1cd8518ae051c30860fdf1b424ae92b19f1b8f3d (diff) | |
| parent | 6bf77365c6b6f1896f8a748c15f9a3470f4dbb47 (diff) | |
Merge branch 'master' of ../qtmobility
Conflicts:
configure.bat
demos/qmlcontacts/qmlcontacts.pro
Diffstat (limited to 'doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp')
0 files changed, 0 insertions, 0 deletions