diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:17:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:17:58 +0100 |
| commit | ac26702bc0aae107706843f78780c0c2451fbacd (patch) | |
| tree | e79b67020a76735cf054ca3b27c5e15de434185f /examples/websockets/doc/simplechat.qdoc | |
| parent | e821221d4bbeab3715702e4265670f58290676d6 (diff) | |
| parent | 2d8c94cf11097b61689757f8a0162bb7dd9d7d0b (diff) | |
| download | qtwebsockets-ac26702bc0aae107706843f78780c0c2451fbacd.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I42592e133b25ebd271b387353a868b68825291d5
Diffstat (limited to 'examples/websockets/doc/simplechat.qdoc')
0 files changed, 0 insertions, 0 deletions