diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-29 03:06:02 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-29 03:06:03 +0100 |
| commit | 69874130efc7f87147a3317d6ce7a17e6f0a466b (patch) | |
| tree | 38725fa14c4d789a01908f5fd3de7a53e23ebca6 /qtwebsockets.pro | |
| parent | fccb43f3ee253cad1aa2b433a9b91fa1a30c7871 (diff) | |
| parent | 87c9513aed424f0c97a78271f59a34873cc7e522 (diff) | |
| download | qtwebsockets-69874130efc7f87147a3317d6ce7a17e6f0a466b.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ib6762714c19354c7adbf0c032d2f9995f576114f
Diffstat (limited to 'qtwebsockets.pro')
0 files changed, 0 insertions, 0 deletions