diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-03 12:43:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-03 12:43:24 (GMT) |
| commit | a6c9422dc2103ee439696b24932149c5b08f2db8 (patch) | |
| tree | 6a06a9fa84c3f4e6d1e4d153ddd5071365428e0f /src/declarative/qml/qml.pri | |
| parent | 4de2ce7717ba52d3056f10e0a9fbb44eba4091bc (diff) | |
| parent | 940d30e9cd76e9b98dd04c2e25a27b6a90bb34b9 (diff) | |
| download | Qt-a6c9422dc2103ee439696b24932149c5b08f2db8.zip Qt-a6c9422dc2103ee439696b24932149c5b08f2db8.tar.gz Qt-a6c9422dc2103ee439696b24932149c5b08f2db8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
My changes 4.7.2
Diffstat (limited to 'src/declarative/qml/qml.pri')
0 files changed, 0 insertions, 0 deletions