diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-17 10:36:28 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-17 10:36:28 +0200 |
commit | 30794c6737a1105bdcd840e41ff374ece3bc60e1 (patch) | |
tree | 528ef56dd2fb5d5ddfb5f11e724d203afbd54b39 /.qmake.conf | |
parent | dd00a38e0d65a73d7fa4df4c2fd196252d40d5ff (diff) | |
parent | c8704b3dbcfecd774244300943b1c63e2bf9841f (diff) | |
download | qtwebsockets-30794c6737a1105bdcd840e41ff374ece3bc60e1.tar.gz |
Merge remote-tracking branch 'origin/5.12.3' into 5.12
Change-Id: I3094f6feb8e1e87a4c5d18fa57d2b2e92c788389
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions