diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 06:23:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-01 06:23:18 (GMT) |
| commit | 25552628432676df568eb422dfb11430bce82888 (patch) | |
| tree | ce2eaf4403115430f6d9f3bda7c7a8941501d752 /src/corelib/io | |
| parent | fdab6c1a9e6425da2685172747c5ddfd0eab0b80 (diff) | |
| parent | eef6498dab75b2dce73e24d9b1c73e5ca17911b2 (diff) | |
| download | Qt-25552628432676df568eb422dfb11430bce82888.zip Qt-25552628432676df568eb422dfb11430bce82888.tar.gz Qt-25552628432676df568eb422dfb11430bce82888.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 'src/corelib/io')
0 files changed, 0 insertions, 0 deletions