diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 10:18:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 10:18:14 (GMT) |
| commit | e68210d2086fbdc8252298f8d7781bf84f73b6ab (patch) | |
| tree | a065683fe2abd91d4127f320d85140099dd56281 /doc/src | |
| parent | 03c2fb7e9c39b433232fb6a18881cd8419d8237b (diff) | |
| parent | 0bf8f70f85a24ab2864775bdd38f5ced43a7d4de (diff) | |
| download | Qt-e68210d2086fbdc8252298f8d7781bf84f73b6ab.zip Qt-e68210d2086fbdc8252298f8d7781bf84f73b6ab.tar.gz Qt-e68210d2086fbdc8252298f8d7781bf84f73b6ab.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:
QLocalSocket/Win: do not emit error() when no error actually occurred
Doc: fix typo
Diffstat (limited to 'doc/src')
0 files changed, 0 insertions, 0 deletions