diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-19 02:44:07 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-19 02:44:07 (GMT) |
| commit | a0973fe3b88dbef39e42da584e63a210693342ee (patch) | |
| tree | f3edf45c2c9dff62a3f5f1cf9fb3c5762ce7e887 /header.LGPL | |
| parent | cd707a865625c7ee0ec836d2a1bdcda847ab0517 (diff) | |
| parent | e007505d8f35c1194caf80ffc4f1e46561ff7be3 (diff) | |
| download | Qt-a0973fe3b88dbef39e42da584e63a210693342ee.zip Qt-a0973fe3b88dbef39e42da584e63a210693342ee.tar.gz Qt-a0973fe3b88dbef39e42da584e63a210693342ee.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
Diffstat (limited to 'header.LGPL')
0 files changed, 0 insertions, 0 deletions