diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-01 06:32:35 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-01 06:32:35 (GMT) |
| commit | 049330b4a54836f227a0e179082527a5272e868d (patch) | |
| tree | b33ce32ee9b86c4c6bf2e87cfd1c6d6f61bf2e2c /src/corelib/corelib.pro | |
| parent | d5449c3cc85624b50e6a6fcabc6ad96b79d4bd0a (diff) | |
| parent | fa7053103f4aa528972dc8766c05b5a1371b2bd8 (diff) | |
| download | Qt-049330b4a54836f227a0e179082527a5272e868d.zip Qt-049330b4a54836f227a0e179082527a5272e868d.tar.gz Qt-049330b4a54836f227a0e179082527a5272e868d.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts:
demos/declarative/flickr/mobile/ImageDetails.qml
Diffstat (limited to 'src/corelib/corelib.pro')
0 files changed, 0 insertions, 0 deletions