diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-30 22:43:34 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-30 22:43:34 (GMT) |
commit | 44109ecd14a707a78140a06e1452d30d52be33af (patch) | |
tree | 79b29bd3443347068cbd870041cd1153e0b4aeba /tests/auto/selftests/expected_assert.lightxml | |
parent | 9e26955ab926afe1bc3306d5f6fcab0c5dfe4db1 (diff) | |
parent | 8365b863419ad68f7dde7b7595e1b943ad9670ca (diff) | |
download | Qt-44109ecd14a707a78140a06e1452d30d52be33af.zip Qt-44109ecd14a707a78140a06e1452d30d52be33af.tar.gz Qt-44109ecd14a707a78140a06e1452d30d52be33af.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed networkselftest failing to resolve hostname
Diffstat (limited to 'tests/auto/selftests/expected_assert.lightxml')
0 files changed, 0 insertions, 0 deletions