diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-13 00:06:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-13 00:06:54 (GMT) |
| commit | 7e2ecab260b2fd5d00d1274892a6f38e325cf72c (patch) | |
| tree | bfbf5a9e9597f07727bd869e3b20f1b6bc983dea /src/declarative/QmlChanges.txt | |
| parent | 5215f835b1878b908bdc8b1f6f281e5f7da6d330 (diff) | |
| parent | b04672e479ae245063e641c77d43e311c0851dc0 (diff) | |
| download | Qt-7e2ecab260b2fd5d00d1274892a6f38e325cf72c.zip Qt-7e2ecab260b2fd5d00d1274892a6f38e325cf72c.tar.gz Qt-7e2ecab260b2fd5d00d1274892a6f38e325cf72c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix slot naming clash
Diffstat (limited to 'src/declarative/QmlChanges.txt')
0 files changed, 0 insertions, 0 deletions