diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-19 01:00:04 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-19 01:00:04 +0200 |
commit | 53bd6b8111eb0d7f23b3b0ca95bef4735f7a952c (patch) | |
tree | f4b1407fa828e4d6ac608dbef97b4b9f3203a7cc /tests/auto/qml/qqmlpromise/qqmlpromise.pro | |
parent | 2bdbf216fe7b6cf9d404b80ac405bd3969f5c07f (diff) | |
parent | c018df5b4075ae962966d4df7653d476dab02840 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I9ef4be23bfe35aa48d4c65d4159e72c527943845
Diffstat (limited to 'tests/auto/qml/qqmlpromise/qqmlpromise.pro')
0 files changed, 0 insertions, 0 deletions