diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 21:31:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 21:31:58 (GMT) |
| commit | af784557a9345153c0e10128f602337017a7e591 (patch) | |
| tree | c3c1fa919db853c27da34bf2d1aa61d2291c59cf /src/script | |
| parent | e923d66d4999117081ae40092a9dbba72d880810 (diff) | |
| parent | 0a1a3606b6a3f466b4e48c64ad30040c729c2ca9 (diff) | |
| download | Qt-af784557a9345153c0e10128f602337017a7e591.zip Qt-af784557a9345153c0e10128f602337017a7e591.tar.gz Qt-af784557a9345153c0e10128f602337017a7e591.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:
QLocalSocket/Win: do not emit error() when no error actually occurred
Doc: fix typo
Diffstat (limited to 'src/script')
0 files changed, 0 insertions, 0 deletions