diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-14 10:27:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-14 10:31:05 +0200 |
| commit | 389547b491985c16d80b7f9de2da972373d7a2f4 (patch) | |
| tree | f0ab62e434e1097c377815c1f4ea89538ec781f5 /sync.profile | |
| parent | aef4cba4ce5f3acfa6765c71283d9363dffe97b7 (diff) | |
| parent | ca03374390c4d5f4e8f2156f3b2038f984ed39d4 (diff) | |
| download | qtwebsockets-389547b491985c16d80b7f9de2da972373d7a2f4.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/imports/qmlwebsockets/qqmlwebsocket.h
Change-Id: Ib883a07eb1784743adca7a0c38fd156800354f4b
Diffstat (limited to 'sync.profile')
0 files changed, 0 insertions, 0 deletions