diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-25 15:26:11 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-25 15:26:11 (GMT) |
commit | 7a028adec5ee09d72d2ca69a666a096cdfef972b (patch) | |
tree | e81fed881ae0df035102f0682128d51f5ec4e72e /LGPL_EXCEPTION.txt | |
parent | 977a7e097f4a2effb43704b9e069576d958842ea (diff) | |
parent | 4c612a53a0fb137ac3eacbea96284eca9f5f018e (diff) | |
download | Qt-7a028adec5ee09d72d2ca69a666a096cdfef972b.zip Qt-7a028adec5ee09d72d2ca69a666a096cdfef972b.tar.gz Qt-7a028adec5ee09d72d2ca69a666a096cdfef972b.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:
Don't use QAtomicInt in statics because they are non-POD.
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions