diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-03 03:01:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-03 03:01:14 +0200 |
| commit | b5e19190b34b8230752f068670aac14ee1dc1aa4 (patch) | |
| tree | 8bd765856a6fc66a7c03baf497123d924f88e603 /.qmake.conf | |
| parent | 597d005c053503e104755bcb7156c0ab2bedfe15 (diff) | |
| parent | 1deee2a4965fd7dc8a44c6d769519c4cbb11da4f (diff) | |
| download | qtwebsockets-b5e19190b34b8230752f068670aac14ee1dc1aa4.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I9c23395dfda8bfaf308dacbf17c471b62803371c
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions