diff options
| author | Alex <qt-info@nokia.com> | 2009-12-07 14:55:17 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2009-12-07 14:55:17 +1000 |
| commit | 49426ff1526f37a75933303ccfef25c04d6be0e1 (patch) | |
| tree | f39cebed196abe748131e3fd48822a4ab3cbef4b /doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | |
| parent | 0c2d36585761182e868887d8384cf9248b022a4b (diff) | |
| parent | 25f72403ebcb3dc9ddbee96982c75196d9efda3b (diff) | |
Merge branch '1.0.0-tp2' of ../qtmobility back into master branch
Conflicts:
doc/html/bearercloud-bearercloud-pro.html
doc/html/bearermonitor-bearermonitor-pro.html
doc/html/qt-mobility-project-library.dcf
doc/html/samplephonebook-contactdetailsform-cpp.html
doc/html/samplephonebook-contactdetailsform-h.html
doc/html/samplephonebook-finddialog-cpp.html
doc/html/samplephonebook-groupdetailsdialog-cpp.html
doc/html/samplephonebook-groupeditdialog-cpp.html
doc/html/samplephonebook-maindialogform-240-320-cpp.html
doc/html/samplephonebook-maindialogform-240-320-h.html
doc/html/samplephonebook-maindialogform-640-480-cpp.html
doc/html/samplephonebook-maindialogform-640-480-h.html
doc/html/samplephonebook-serialiser-cpp.html
doc/html/samplephonebook-serialiser-h.html
examples/bearercloud/bearercloud.pro
examples/bearermonitor/bearermonitor.pro
examples/fetchgooglemaps/fetchgooglemaps.pro
examples/logfilepositionsource/logfilepositionsource.pro
examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.pro
src/bearer/bearer.pro
src/messaging/messaging.pro
src/s60installs/s60installs.pro
tests/bearerex/bearerex.pro
Diffstat (limited to 'doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp')
0 files changed, 0 insertions, 0 deletions