diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-26 02:49:51 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-26 02:49:51 (GMT) |
commit | 0a36afede483a05d664036a2d4366ca305215266 (patch) | |
tree | be97efdeb867c4509955c9d638bf0b07fafae7ea /doc/src/snippets/code/doc_src_qalgorithms.qdoc | |
parent | 57e9bffdde1d1ac800720082961c2f12489728a7 (diff) | |
parent | 603df0ef7d92c8492af5957f3f6cc9d9fbc48888 (diff) | |
download | Qt-0a36afede483a05d664036a2d4366ca305215266.zip Qt-0a36afede483a05d664036a2d4366ca305215266.tar.gz Qt-0a36afede483a05d664036a2d4366ca305215266.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
My 4.6.3 changes
Don't use QAtomicInt in statics because they are non-POD.
Diffstat (limited to 'doc/src/snippets/code/doc_src_qalgorithms.qdoc')
0 files changed, 0 insertions, 0 deletions