diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:04:38 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 15:17:10 +0200 |
| commit | 85d5538735a7ec82690a8a2026aa466183818e25 (patch) | |
| tree | c82c864ac22e8a534732ee6d8d600e54c4984afb | |
| parent | bfe9885c1974e9962ca3b0b88030d08a03dfa05c (diff) | |
| parent | 44750221a97f0ad5da51ca51e2f14b701197c306 (diff) | |
| download | qtwebsockets-85d5538735a7ec82690a8a2026aa466183818e25.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I1c65346e0625bb1653fa02ed87fd7999608f5482
0 files changed, 0 insertions, 0 deletions