diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:28:07 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:28:07 +0100 |
| commit | 09f0d34c8800d1cb32bfde3c07093adbee44660b (patch) | |
| tree | c21d51106c74ac61e1fe7d8457ab1f0cd3438cc6 | |
| parent | 31f06ca32ebd87c5b1bad6882e2d0b4689c7e85a (diff) | |
| parent | 10a64558ce927e2df0f2dfe7ff3d786d4737c06e (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Iaa898264fd37a294fcea824a518fb27380350257
0 files changed, 0 insertions, 0 deletions