diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:11:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-04 16:11:21 +0200 |
| commit | ca99a1b1f28ab91cdf675a95a20aa64d988d551e (patch) | |
| tree | 6c86574013a2abf09f7b0307c9e3b58f97fea4cb /tests | |
| parent | a4afeaa8b0b00373eab1b2a974aed2cbed128844 (diff) | |
| parent | 1d780dfbffa4f16501597c1679c12144b3f9e62a (diff) | |
| download | qtwebsockets-ca99a1b1f28ab91cdf675a95a20aa64d988d551e.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
Change-Id: Idf03c021f070af76a0b44799e10de78eb6e801e7
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions