diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:35 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:35 +0100 |
| commit | 5f16a5cda1d2795ff6cb0475f1a2097383104006 (patch) | |
| tree | 3938c121184522be9689a0c43f0f6fc946297ef3 | |
| parent | 192a5ec7e93b15c931ac479abf400dc371697ef6 (diff) | |
| parent | 58dc09497d2fb580cf5e356bef91b0dc61ae81b7 (diff) | |
| download | qtwebsockets-5f16a5cda1d2795ff6cb0475f1a2097383104006.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I9e8b5acb29983285786fd10b5769d703e53078fd
0 files changed, 0 insertions, 0 deletions