diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:54 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:54 +0200 |
| commit | 4301d626f8e6e2dabf3a71205eb632f001827a7f (patch) | |
| tree | c1059d5d5877a72e4b1816d587ce798bd74d5dab | |
| parent | ea22c846b285ee4f71efc0fc050a4759880433a8 (diff) | |
| parent | c98ca1256d40a59612b31c78c3e4f2f01e1b861f (diff) | |
| download | qtwebsockets-4301d626f8e6e2dabf3a71205eb632f001827a7f.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
Change-Id: Ib38d0c86aa010b06b9a201115dfbc9f091abeb0e
0 files changed, 0 insertions, 0 deletions