summaryrefslogtreecommitdiff
path: root/qtwebsockets.pro
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-22 10:12:00 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-22 10:12:00 +0200
commitd937c580ec5ce24a4aad6cc9e4927cad5a93acda (patch)
tree5f2750bca3c9679e1047db4645f7d5534d531719 /qtwebsockets.pro
parent37203fab746060edaccea8abcddc181611ab0555 (diff)
parent593466b4b902536743050e088a0e4eee9f007c76 (diff)
downloadqtwebsockets-d937c580ec5ce24a4aad6cc9e4927cad5a93acda.tar.gz
Merge remote-tracking branch 'origin/5.15' into 5.15.0
Change-Id: I0ffba653f33728729b5feac6544263bb351fdc34
Diffstat (limited to 'qtwebsockets.pro')
0 files changed, 0 insertions, 0 deletions