diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-20 16:25:40 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-20 16:25:40 +0200 |
commit | b7b3ef26b7da4d25c61bfbc193d3158c6d50330c (patch) | |
tree | 21d26cc6a01c63745f417ba74debbc6db9513318 /.qmake.conf | |
parent | 34c8622dbaafaa67c15a221a6c90390419c28063 (diff) | |
parent | df58e20996c3207e4c0dbf79315fe196545c6932 (diff) | |
download | qtwebsockets-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