diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:51:30 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:51:30 +0200 |
| commit | 717ba7e69a1c16f8d4b26984a63b3c0450b131bf (patch) | |
| tree | 362a8a765e256edeacf47b4b172ee5aed7b7c27c /examples | |
| parent | 0c35647c33a51a2b9ce8319cd18283845aef40a1 (diff) | |
| parent | eb16b1970293dfeb5918751afbdf1fb7f62028e1 (diff) | |
| download | qtwebsockets-717ba7e69a1c16f8d4b26984a63b3c0450b131bf.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: I8ef1da19810c1bf4d68bf157848bccb5446669cc
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions