diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-04-08 00:52:14 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-04-08 00:52:14 (GMT) |
commit | 979ad950e257c0c90463ab6c2db7fea4aece3331 (patch) | |
tree | 9bd14fb2e786d5a84ae3b5685c46e6e7a5594b59 /src/declarative/qml/qdeclarativecustomparser.cpp | |
parent | fac110fd9313972f001bf8b52b0254cc2d67ef66 (diff) | |
parent | 9d9161446bfad883c298d54a122e822c5e273a9c (diff) | |
download | Qt-979ad950e257c0c90463ab6c2db7fea4aece3331.zip Qt-979ad950e257c0c90463ab6c2db7fea4aece3331.tar.gz Qt-979ad950e257c0c90463ab6c2db7fea4aece3331.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativecustomparser.cpp')
0 files changed, 0 insertions, 0 deletions