diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:27:46 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:27:46 +0100 |
| commit | 7268234726f41dec0615abfe651e882eef0cda48 (patch) | |
| tree | d5f87d27a9038ba617ba6478959ddb9d900aed96 | |
| parent | 864c88b9a3ca93ebd300d7c180260087265937ef (diff) | |
| parent | 9c821c6dae5a624f13d0c04e1d80aa804ed540c9 (diff) | |
| download | qtdoc-7268234726f41dec0615abfe651e882eef0cda48.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Iedca7a1d55ce814fd0825f9a95c9a85b127d01df
0 files changed, 0 insertions, 0 deletions