diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-24 22:56:00 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-24 22:56:00 (GMT) |
| commit | 89eb5c7ea21502c23dd509035c0eaf0fdea0d01e (patch) | |
| tree | d273a07cdd0c8a731fdae3665f75052ce436f1d2 /src | |
| parent | 3b19434cf0bef753927701ca1d35876f24ff21b7 (diff) | |
| parent | 668c9d63d27b2a925c18f3128747c20b37560569 (diff) | |
| download | Qt-89eb5c7ea21502c23dd509035c0eaf0fdea0d01e.zip Qt-89eb5c7ea21502c23dd509035c0eaf0fdea0d01e.tar.gz Qt-89eb5c7ea21502c23dd509035c0eaf0fdea0d01e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
src/declarative/util/qdeclarativexmllistmodel.cpp
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions