diff options
author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-03 23:00:13 (GMT) |
---|---|---|
committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-03 23:00:13 (GMT) |
commit | a82e30125f2d6f9a8dc820c5d117a359244231f7 (patch) | |
tree | 23b3f33eb9c8a2d02c1f7932c5ae20d83361a4e1 /src/declarative/qml/qdeclarativecontext_p.h | |
parent | d70dbc6050404787c15be814054ab251cfe09db7 (diff) | |
parent | 14e4fd08ff67578dccf5e85a88fcadf747ae5852 (diff) | |
download | Qt-a82e30125f2d6f9a8dc820c5d117a359244231f7.zip Qt-a82e30125f2d6f9a8dc820c5d117a359244231f7.tar.gz Qt-a82e30125f2d6f9a8dc820c5d117a359244231f7.tar.bz2 |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/declarative/qml/qdeclarativecontext_p.h')
0 files changed, 0 insertions, 0 deletions