diff options
| author | Alex <qt-info@nokia.com> | 2010-06-04 14:32:32 +1000 |
|---|---|---|
| committer | Alex <qt-info@nokia.com> | 2010-06-04 14:32:32 +1000 |
| commit | 162309abe5249746ec2d1bf41cfe43b6246b0342 (patch) | |
| tree | 76f1442756c1951889355cb156f963bfe19f1146 /doc/src/snippets/sysinfo-snippets/main.cpp | |
| parent | a2bfcbd995221be8aa6eec980f0dcaed59e4a173 (diff) | |
| parent | 5d7bab66dd1d632c1ef8abaf17d5f1cc50a8dbe8 (diff) | |
Merge branch '1.0' into merge
Conflicts:
doc/html/qmediabindableinterface-members.html
doc/html/qmediaplaylistsourcecontrol-members.html
doc/html/qmetadatacontrol.html
doc/html/qmetadatawritercontrol-members.html
doc/html/qtmultimediakit.html
doc/html/qvideooutputcontrol.html
plugins/sensors/symbian/sensorbackendsym.cpp
Diffstat (limited to 'doc/src/snippets/sysinfo-snippets/main.cpp')
0 files changed, 0 insertions, 0 deletions