diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 00:12:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-08 00:12:21 (GMT) |
| commit | 8b8a4e960be30d64d2bc093662ddb1cefeae524e (patch) | |
| tree | 928e9d9bcc2741262bd4a2e6fecb807d4d8ce77e /tests/auto/qabstractsocket | |
| parent | 558acd8c8ff94c6fd1e96514a2dffb587a66bb2f (diff) | |
| parent | ff9206bb268b816e1932eca7091bed16c9fd2426 (diff) | |
| download | Qt-8b8a4e960be30d64d2bc093662ddb1cefeae524e.zip Qt-8b8a4e960be30d64d2bc093662ddb1cefeae524e.tar.gz Qt-8b8a4e960be30d64d2bc093662ddb1cefeae524e.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix build with cups 1.5 snapshots
Diffstat (limited to 'tests/auto/qabstractsocket')
0 files changed, 0 insertions, 0 deletions