diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 17:07:08 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 17:07:08 +0100 |
| commit | 394b7bc81f3f5109bc0cfd0a86497568ad64f2b6 (patch) | |
| tree | 374885f821b428407f96d980e2e8dfe19ae39af4 /tests | |
| parent | 759b6b12489b68fcbd755398ff9337acefb035a0 (diff) | |
| parent | df320becb3d23ea99bf1ddfc190557e7a1729928 (diff) | |
| download | qtwebsockets-394b7bc81f3f5109bc0cfd0a86497568ad64f2b6.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Ifee77abab352e92b52a2ddba16447107005e3253
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions