diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:04:30 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:30:03 +0200 |
commit | 0634c8104558dbb7acd314d52cf4b039c8c3689d (patch) | |
tree | bce9ea4123fd84f4097d0947a83337420f1004f3 /LICENSE.GPL3 | |
parent | 9fcd04fc3ca878de0db92f1175bc3cb4ff1e6420 (diff) | |
parent | f505a4cedd2a36ea6f2aaa309bf294598297df89 (diff) | |
download | qtwebsockets-0634c8104558dbb7acd314d52cf4b039c8c3689d.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'LICENSE.GPL3')
0 files changed, 0 insertions, 0 deletions