diff options
author | Martin Jones <martin.jones@nokia.com> | 2011-01-19 01:40:49 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2011-01-19 01:40:49 (GMT) |
commit | ebd4bc73c46c2962742a682b6a391fb68c482aec (patch) | |
tree | 3045a1af9e65ca6500437d4e90ccfd3637fb6976 /LGPL_EXCEPTION.txt | |
parent | 9c1e67d83f6175f339e6771be05ee60ba72426b3 (diff) | |
parent | 5d9738ed88da269033333299c16558882d346514 (diff) | |
download | Qt-ebd4bc73c46c2962742a682b6a391fb68c482aec.zip Qt-ebd4bc73c46c2962742a682b6a391fb68c482aec.tar.gz Qt-ebd4bc73c46c2962742a682b6a391fb68c482aec.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Diffstat (limited to 'LGPL_EXCEPTION.txt')
0 files changed, 0 insertions, 0 deletions