diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-01 11:46:51 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-01 11:46:51 +0100 |
| commit | 9a0a655b51086045ce86c9d001d34738d84d27ff (patch) | |
| tree | f70336d0e4e40f282aa38284ba314b9618e55e1a /.gitattributes | |
| parent | 58dc09497d2fb580cf5e356bef91b0dc61ae81b7 (diff) | |
| parent | ef876a7d2964f53faf160af2b01798e930dfaa94 (diff) | |
| download | qtwebsockets-9a0a655b51086045ce86c9d001d34738d84d27ff.tar.gz | |
Merge remote-tracking branch 'origin/5.12.1' into 5.12
Change-Id: I88194f5247b1b8adc79056a2c2cba19adb90ca8a
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions