diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:44:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:44:07 +0200 |
| commit | 2baa571e0d95d3e9bf182dc035c8ff0970bb68ea (patch) | |
| tree | 174e872c084319e19cd0ebd74915048d99c18c84 /.qmake.conf | |
| parent | 40c0c43f59b97e5bee4a8994a499800e1f46b8d1 (diff) | |
| parent | 00156d63eea2fb7681a8a00a3144392d6325e5cb (diff) | |
| download | qtwebsockets-2baa571e0d95d3e9bf182dc035c8ff0970bb68ea.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I8a2d6875b68c99786f99ec0dc380f8725c6abd42
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions