diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:12:34 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:12:34 +0100 |
| commit | c682f4cebf2b2f5b9154fabb6b0d9cc4204ff400 (patch) | |
| tree | edf57aa4ba752675baab674ff811fe6a7470f69c | |
| parent | 746d6a4b8318b067a1f568f226522b2f8cc91094 (diff) | |
| parent | 2cfef9d049640199559b20d05744db9f7abfde63 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: Id9ee7c383f2762f18dad47dc041628ddcf03a44c
0 files changed, 0 insertions, 0 deletions