diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:33:53 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:33:53 +0200 |
commit | ba122ea95e89ec6f687b9f0386a017cf281bcc40 (patch) | |
tree | e9eadad9147abb934cf4471760f2bf4d6feee0e7 /.gitattributes | |
parent | 30794c6737a1105bdcd840e41ff374ece3bc60e1 (diff) | |
parent | 9db762ad97338567a614177564f68fee780fefce (diff) | |
download | qtwebsockets-ba122ea95e89ec6f687b9f0386a017cf281bcc40.tar.gz |
Merge remote-tracking branch 'origin/5.12.4' into 5.12
Change-Id: Ib3b749527e242cbfc2611467c6ecd39cef865662
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions