diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:38:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:38:55 +0100 |
| commit | b797778da01f72e64cda8680f29f3fa8434ffb0a (patch) | |
| tree | a917f080b40188e8f937a50b29e47898e9709a51 /qtwebsockets.pro | |
| parent | a834ce5889dc3a79eebe1ac0a1576603b68f5a4b (diff) | |
| parent | 85a8ea105646c7d871f982b890ef5f6faa91824d (diff) | |
| download | qtwebsockets-b797778da01f72e64cda8680f29f3fa8434ffb0a.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I96657102802860c8490c162462324e661592d879
Diffstat (limited to 'qtwebsockets.pro')
0 files changed, 0 insertions, 0 deletions