diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-14 05:37:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-14 05:37:41 (GMT) |
| commit | 00cd44c1976fb25f419e487bd6e626c5d2520727 (patch) | |
| tree | 64c0c1fc5baa96c63c59a414dc5adb82881bc720 /src/dbus | |
| parent | 040268af2d53532e7f6501c24cdfcb424d60be89 (diff) | |
| parent | e4257e41c1c9e764d27f1c61f9173c34444236f3 (diff) | |
| download | Qt-00cd44c1976fb25f419e487bd6e626c5d2520727.zip Qt-00cd44c1976fb25f419e487bd6e626c5d2520727.tar.gz Qt-00cd44c1976fb25f419e487bd6e626c5d2520727.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Abort working replies with error when network session fails.
qrgb565: Use the trivial qt_memconvert() and qt_rectconvert()
Diffstat (limited to 'src/dbus')
0 files changed, 0 insertions, 0 deletions