diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:19 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:30:19 +0100 |
| commit | 06121be1d8620e9be2efadf6f6ac83102ef5a24e (patch) | |
| tree | 0a1910ec1da5bc0467140039d08666e6a401cfd9 | |
| parent | 3cc9fe5db038ee465f97603f94cbbb64979d8c0b (diff) | |
| parent | 66f1a94aead9c9b3dacbf91ef763edcda217e56e (diff) | |
| download | qtscript-06121be1d8620e9be2efadf6f6ac83102ef5a24e.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Ie657c3cef2b06d04f1b744fffdd9c550b57bfe69
0 files changed, 0 insertions, 0 deletions