diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:00:59 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:11:53 +0200 |
| commit | 534c9b758289d77e221130ec38493beb4964e0fc (patch) | |
| tree | b13041f7f15d3e5b9a90522d5d3b93c03ce9460f | |
| parent | dff2332c68e7c20676702648457f9d11f90cc93b (diff) | |
| parent | 8a610433fa26c2601d669b45e903566287923bec (diff) | |
| download | qtwebchannel-534c9b758289d77e221130ec38493beb4964e0fc.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Ic05bb3b2a23431b871c8b19412aa2b1b14f5f6cf
0 files changed, 0 insertions, 0 deletions