diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-09-05 23:54:38 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-09-05 23:54:38 (GMT) |
commit | c3bf669fb7fdac530365f36750613f2e21893a77 (patch) | |
tree | 0d7ac6e135913221f94183968a599c4027b2b21e /src/qbase.pri | |
parent | 0b5fa23dd25c78b71dfb0932008d226639a43445 (diff) | |
parent | 63e15bbb9666ab49305d45380f9f580fb0e168ca (diff) | |
download | Qt-c3bf669fb7fdac530365f36750613f2e21893a77.zip Qt-c3bf669fb7fdac530365f36750613f2e21893a77.tar.gz Qt-c3bf669fb7fdac530365f36750613f2e21893a77.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/qbase.pri')
0 files changed, 0 insertions, 0 deletions