diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-05 13:51:10 +1000 |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-05 13:51:10 +1000 |
| commit | 48fd47f64f3f73e82016161d82cdf67908a9c653 (patch) | |
| tree | e337d89e525d3a55d2b9aca8c19d2b3b43c65c50 /src/declarative/qml/qdeclarativexmlhttprequest.cpp | |
| parent | a7b46bda37a428ae2e5554aa8e58469c92b310a9 (diff) | |
| parent | c9b3309ae1d3a34790d71fdfd7dcaab79433f049 (diff) | |
| download | qt4-tools-48fd47f64f3f73e82016161d82cdf67908a9c653.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
Diffstat (limited to 'src/declarative/qml/qdeclarativexmlhttprequest.cpp')
0 files changed, 0 insertions, 0 deletions