diff options
author | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:46:57 +0300 |
---|---|---|
committer | Iikka Eklund <iikka.eklund@digia.com> | 2014-04-01 11:46:58 +0300 |
commit | 91697f5ce50604f29e4d61e921cfab60eeaf8a61 (patch) | |
tree | 3b3c9a062f209931a43241b19d8603b1ca3a023d /src/declarative/graphicsitems/qdeclarativeloader_p_p.h | |
parent | ec7b40e87a2b129ccecf5bc46b5f84cf5563291c (diff) | |
parent | 292a6707e565f226314fba541b3cdeaef5046d4e (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I222f518e398b90382e452921411cfe81836ce02f
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeloader_p_p.h')
0 files changed, 0 insertions, 0 deletions