diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 22:30:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 22:30:52 (GMT) |
| commit | eef6498dab75b2dce73e24d9b1c73e5ca17911b2 (patch) | |
| tree | 23f475a6f89f8970dfed480fcb89345db06a7c64 /header.BSD | |
| parent | c80df14aa4e7e31f4b9d19c23ed9e7793486d70e (diff) | |
| parent | d548fe325f8293a9bb444a317e5191a9b639d24e (diff) | |
| download | Qt-eef6498dab75b2dce73e24d9b1c73e5ca17911b2.zip Qt-eef6498dab75b2dce73e24d9b1c73e5ca17911b2.tar.gz Qt-eef6498dab75b2dce73e24d9b1c73e5ca17911b2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix compilation in qglobal.h when included from a .c file
Fix compilation in namespace
qSwap: use std::swap as implementation, and specialize std::swap for our container
Diffstat (limited to 'header.BSD')
0 files changed, 0 insertions, 0 deletions