diff options
| author | Alex <qt-info@nokia.com> | 2010-06-16 09:27:22 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2010-06-16 09:27:22 +1000 |
| commit | c5015bed56eac0085abc588e89fd94d52ee2115f (patch) | |
| tree | 372c178a9554d6d55b6494f0d11319cc68fe799b /doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp | |
| parent | b5d4787ab326889901225a060edfb0113c9fd1b7 (diff) | |
| parent | b1e64744dcae67e79e59807d18963080315577eb (diff) | |
Merge branch 'master' into ipc
Conflicts:
doc/html/annotated.html
doc/html/classes.html
doc/html/functions.html
doc/html/qservicefilter.html
doc/html/qserviceinterfacedescriptor.html
src/serviceframework/qservicemanager.cpp
Diffstat (limited to 'doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp')
0 files changed, 0 insertions, 0 deletions