diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:34:47 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-10 21:34:47 +0100 |
| commit | 192a5ec7e93b15c931ac479abf400dc371697ef6 (patch) | |
| tree | 3938c121184522be9689a0c43f0f6fc946297ef3 | |
| parent | 5b1f4d038f27ae37a434f87c605422ac8452f1ef (diff) | |
| parent | e567b9d8c8447f8d2bd35ab3184b956e95380222 (diff) | |
| download | qtwebsockets-192a5ec7e93b15c931ac479abf400dc371697ef6.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Icc838b713efe15ffa38dc1fc0ad90c37e9fa7c6c
0 files changed, 0 insertions, 0 deletions