diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-12 10:33:52 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-12 10:33:52 (GMT) |
| commit | 34a4860216723c625e9311c6040fdbd1c5744b02 (patch) | |
| tree | 0f7d785bb20a8aa004d053a07522cd400a8a3054 /src/testlib | |
| parent | 47f86ea037c11e2890f331f88c05fcd8667118c2 (diff) | |
| parent | 76dab9f26af4fee925ce36eb237350ad07dfeefd (diff) | |
| download | Qt-34a4860216723c625e9311c6040fdbd1c5744b02.zip Qt-34a4860216723c625e9311c6040fdbd1c5744b02.tar.gz Qt-34a4860216723c625e9311c6040fdbd1c5744b02.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
tests/auto/qimagereader/tst_qimagereader.cpp
Diffstat (limited to 'src/testlib')
0 files changed, 0 insertions, 0 deletions