summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-18 04:14:37 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-18 04:14:37 (GMT)
commit0d40dbfe167c1e74871002f964f68fac0ccbdd8c (patch)
tree0ac2f4205ed54d48cf63553695a07108580eb4db /src/declarative
parent7296a5419cf1e0d616aa193829196ec42db55db4 (diff)
parentd5b5a1ef99dbe20ee9cb3833fb5095c2071c8b12 (diff)
downloadQt-0d40dbfe167c1e74871002f964f68fac0ccbdd8c.zip
Qt-0d40dbfe167c1e74871002f964f68fac0ccbdd8c.tar.gz
Qt-0d40dbfe167c1e74871002f964f68fac0ccbdd8c.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: tst_qhttp: replace legacy qt-test-server hostname in testdata.
Diffstat (limited to 'src/declarative')
0 files changed, 0 insertions, 0 deletions