summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-05 13:34:19 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-05 13:34:19 +0100
commit127d475324c2133b8d7e2f4712e71d14fa84c560 (patch)
tree892846c90d8761cd20e027e9f40c7c7b6b25d7e3
parent59a4bc77f412c00968fad729bf3c11c94825545d (diff)
parent2d10eaba1607f3efaaf3020e4b7c57a31060177e (diff)
downloadqtwebsockets-127d475324c2133b8d7e2f4712e71d14fa84c560.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1
Conflicts: .qmake.conf Change-Id: I2bae5688cc62bffed1cfccc45e7129cf00a769f8
0 files changed, 0 insertions, 0 deletions