summaryrefslogtreecommitdiff
path: root/doc/src/snippets/code/doc_src_qalgorithms.cpp
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2011-07-08 09:57:45 +0200
committerJiang Jiang <jiang.jiang@nokia.com>2011-07-08 09:57:45 +0200
commit978e22d6529d7cbe9472749352d632eefd22cd07 (patch)
treeac92a4f489c0a93a48eb502457c679659e472ac0 /doc/src/snippets/code/doc_src_qalgorithms.cpp
parentcb11bb0df08f134bbded52fd4140197a01570a0e (diff)
parent1dd26ea2486db87b61e8e9f70a1e04f7386405ef (diff)
downloadqt4-tools-978e22d6529d7cbe9472749352d632eefd22cd07.tar.gz
Merge remote branch 'mainline/4.8' into staging
Conflicts: dist/changes-4.8.0
Diffstat (limited to 'doc/src/snippets/code/doc_src_qalgorithms.cpp')
0 files changed, 0 insertions, 0 deletions