diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-28 18:37:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-28 18:37:16 (GMT) |
| commit | 6940070adb45d67a0a9186205a4914a0a6c14135 (patch) | |
| tree | 6d8835f61c1b74eba251e4910b602af4aacc5767 /src/gui/text | |
| parent | 586ff2d7e613137a1199dc973739235245730716 (diff) | |
| parent | 8d37b81589fd8727890def1e2cee09882dc2b941 (diff) | |
| download | Qt-6940070adb45d67a0a9186205a4914a0a6c14135.zip Qt-6940070adb45d67a0a9186205a4914a0a6c14135.tar.gz Qt-6940070adb45d67a0a9186205a4914a0a6c14135.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:
tst_selftest: parse benchlib results in XML format too
tst_selftests: replace a line number with __LINE__ in XML too
Diffstat (limited to 'src/gui/text')
0 files changed, 0 insertions, 0 deletions