diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:45:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:45:42 +0200 |
| commit | cd80c041220df2875297622a0012933412730e9d (patch) | |
| tree | 2f691d075c2cc708f1b2121306df1f5a019ce33b /.gitattributes | |
| parent | 00156d63eea2fb7681a8a00a3144392d6325e5cb (diff) | |
| parent | 9d28979b204313b4db1ce8e9f367204a65be9c64 (diff) | |
| download | qtwebsockets-5.7.0-rc1.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1
Conflicts:
.qmake.conf
Change-Id: I80cd189fc82481fdc2241db6d2a7d95537c340a6
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions