summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-05 13:29:56 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-05 13:29:57 +0100
commitfacf59c1eae3958b8c2972c167cede215219c814 (patch)
tree2c9e53f6e5f585399e87d0af4e0c5a3e551c7375
parent2f5e7d048f291580a83677b415f4758aab04882a (diff)
parent9f056f7902350106d992d43cb04a9e2f6b6b299b (diff)
downloadqtwebchannel-5.15.0-beta1.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1
Conflicts: .qmake.conf Change-Id: I716d1fb804284a0e9d7ca6b7fd46332037b28f69
0 files changed, 0 insertions, 0 deletions