diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-06-29 09:06:04 +1000 |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-06-29 09:06:04 +1000 |
| commit | 1aa27685ec4a3cd2a282db80bdcd81c47f1222c0 (patch) | |
| tree | 415df4504bce049de369669572ec3d2ba8c0c0b6 /doc/src/snippets/service-snippets/bluetoothtransferplugin.cpp | |
| parent | 763ca2fa8f277774a2f1132bf4164ec4967cf640 (diff) | |
| parent | a80886d0c48effedaa188350800df8d3d49621a8 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qtmobility/qtmobility
Conflicts:
configure.bat
doc/html/lightmaps.html
doc/src/examples/logfilepositionsource.qdoc~Temporary merge branch 2
src/multimedia/qcameraviewfinder.h
src/serviceframework/qremoteservicecontrol.h
Diffstat (limited to 'doc/src/snippets/service-snippets/bluetoothtransferplugin.cpp')
0 files changed, 0 insertions, 0 deletions