diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:15:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-24 17:15:53 +0000 |
| commit | 30405c50a521146f2dda49916f160ab722316a82 (patch) | |
| tree | f7daaa3565d523932685716dd9b9fa16728fa534 /src/declarative/qml/qdeclarativeglobal_p.h | |
| parent | ad3874ec96c50ec23eeeddda6b5758beda5c9c3d (diff) | |
| parent | bfbcec26eb6f9423ee27d75ae5abcd70cd255390 (diff) | |
| download | qtquick1-30405c50a521146f2dda49916f160ab722316a82.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5v5.5.0-alpha1
Diffstat (limited to 'src/declarative/qml/qdeclarativeglobal_p.h')
0 files changed, 0 insertions, 0 deletions