summaryrefslogtreecommitdiff
path: root/.qmake.conf
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-20 16:25:40 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-20 16:25:40 +0200
commitb7b3ef26b7da4d25c61bfbc193d3158c6d50330c (patch)
tree21d26cc6a01c63745f417ba74debbc6db9513318 /.qmake.conf
parent34c8622dbaafaa67c15a221a6c90390419c28063 (diff)
parentdf58e20996c3207e4c0dbf79315fe196545c6932 (diff)
downloadqtwebsockets-b7b3ef26b7da4d25c61bfbc193d3158c6d50330c.tar.gz
Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions