diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-01-28 05:57:57 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-01-28 05:57:57 (GMT) |
| commit | feabbd82912ff39b42d02ee669aefd93a81eed11 (patch) | |
| tree | 1c9c5cf3220ee23453ad3c993110ec27de0ca28c /doc/src/snippets/designer | |
| parent | 1391ebba9eb214f1f7f7b236f0e22eb41828f72c (diff) | |
| parent | 6bdac26b9fc1575ee7783a47604108efc7058dcb (diff) | |
| download | Qt-feabbd82912ff39b42d02ee669aefd93a81eed11.zip Qt-feabbd82912ff39b42d02ee669aefd93a81eed11.tar.gz Qt-feabbd82912ff39b42d02ee669aefd93a81eed11.tar.bz2 | |
Merge branch 'qtquick11' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Conflicts:
tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
Diffstat (limited to 'doc/src/snippets/designer')
0 files changed, 0 insertions, 0 deletions