diff options
| author | abcd <qt-info@nokia.com> | 2010-11-23 15:54:16 +0000 |
|---|---|---|
| committer | abcd <qt-info@nokia.com> | 2010-11-23 15:54:16 +0000 |
| commit | dd79d70cec6bc4cb381fc2893de618b4c82dab3a (patch) | |
| tree | 3121c6b499c435fc145f1b0441289776a7d56cf8 /doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp | |
| parent | d0643b8ab948efc1543e22f421b4ebfe786a6c41 (diff) | |
| parent | c952ce76f8deb876744d1f2c459cca3a7a73ba4b (diff) | |
Merge branch 'maemo6-dev' into 1.1
Conflicts:
tests/auto/qlandmarkmanager/tst_qlandmarkmanager.cpp
Diffstat (limited to 'doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp')
0 files changed, 0 insertions, 0 deletions