diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 13:09:00 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 13:09:00 +0200 |
| commit | 36f5969b0b4ba81c3e831b481ab426a79e3e17da (patch) | |
| tree | 0906530f3853abd00fe2812eb1dfa23397b08c89 /.qmake.conf | |
| parent | dcf08a4c702f90cc092629078de48a0ad0d68562 (diff) | |
| parent | 465c6c3914455e8ed20f938e5d4a35e6decb446c (diff) | |
| download | qtwebsockets-36f5969b0b4ba81c3e831b481ab426a79e3e17da.tar.gz | |
Merge remote-tracking branch 'origin/5.12.5' into 5.12
Change-Id: Ie2f07797983e53d0a998e1b0f76a8efd951408f7
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions