summaryrefslogtreecommitdiffstats
path: root/src/xmlpatterns
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-28 14:00:41 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-28 14:00:41 (GMT)
commit8d37b81589fd8727890def1e2cee09882dc2b941 (patch)
tree751fe91499ee991d1036f61984dee31492be25d3 /src/xmlpatterns
parentaa697d98d666046e9b504fcc376a6a2c9aa36812 (diff)
parent13adf589a053186e9f678c9f09b02213246e4cbe (diff)
downloadQt-8d37b81589fd8727890def1e2cee09882dc2b941.zip
Qt-8d37b81589fd8727890def1e2cee09882dc2b941.tar.gz
Qt-8d37b81589fd8727890def1e2cee09882dc2b941.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/xmlpatterns')
0 files changed, 0 insertions, 0 deletions