diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-15 06:37:23 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-15 06:37:23 +1000 |
| commit | 86c6b7ec20bd1b9f208685cb1daa20ee144c6edd (patch) | |
| tree | 5c51d39d2be3b19e8560a930bec2cf9784522d58 /doc/src/snippets/code/doc_src_qalgorithms.cpp | |
| parent | 75f2dbb98dac8560a34a59be5552b4b8885c9d2e (diff) | |
| parent | c1788c07deaf4effb5e7c2d2564e7077b9ddcf95 (diff) | |
| download | qt4-tools-86c6b7ec20bd1b9f208685cb1daa20ee144c6edd.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix build
get rid of unwanted dependencies and unused header includes
sync qws_dataDir() with coreapp's internal qws_dataDir()
Documentation fix.
Diffstat (limited to 'doc/src/snippets/code/doc_src_qalgorithms.cpp')
0 files changed, 0 insertions, 0 deletions