diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-21 22:32:21 +1000 |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-21 22:32:21 +1000 |
commit | 45f372edda9d43bc98c7742a5dfdd89e4efbe225 (patch) | |
tree | 4b5e282a5959b2bc16a9f3d913e37791f16d9391 /doc/src/snippets/code/doc_src_qalgorithms.cpp | |
parent | 86e5445e210f812e3f3059e175cce323c68ac216 (diff) | |
parent | 1075b98d6557e00618105a9d2ba58d1df9812633 (diff) | |
download | qt4-tools-45f372edda9d43bc98c7742a5dfdd89e4efbe225.tar.gz |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Removed demo files accidentally introduced by commit 3abaecc3.
Doc: Added a link to the How to Learn Qt document.
Doc: Fixed shader program snippet.
Doc: Fixed page step sizes in a snippet for QAbstractScrollArea.
Doc: Moved general notes about character conversion.
Diffstat (limited to 'doc/src/snippets/code/doc_src_qalgorithms.cpp')
0 files changed, 0 insertions, 0 deletions