diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-25 03:01:17 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-25 03:01:17 +0100 |
commit | 2e7f2cc29454859ccd7b36e487f5970407d353b0 (patch) | |
tree | 394311d2913679477d42273318d6fec42de3348f /src | |
parent | 127d475324c2133b8d7e2f4712e71d14fa84c560 (diff) | |
parent | 9d3eb184c72333a95ee8f9ee33bd51942271de64 (diff) | |
download | qtwebsockets-2e7f2cc29454859ccd7b36e487f5970407d353b0.tar.gz |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I69ac9d8a828ba664e38b1f5abdfd0830f55c134e
Diffstat (limited to 'src')
-rw-r--r-- | src/websockets/doc/src/external-resources.qdoc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/websockets/doc/src/external-resources.qdoc b/src/websockets/doc/src/external-resources.qdoc index 40e4257..ce39b9b 100644 --- a/src/websockets/doc/src/external-resources.qdoc +++ b/src/websockets/doc/src/external-resources.qdoc @@ -86,12 +86,12 @@ */ /*! - \externalpage http://autobahn.ws/testsuite/ + \externalpage https://github.com/crossbario/autobahn-testsuite \title Autobahn|Testsuite */ /*! - \externalpage http://autobahn.ws/testsuite/installation.html + \externalpage https://github.com/crossbario/autobahn-testsuite/blob/master/README.md#installation \title Autobahn|Testsuite installation documentation */ @@ -103,6 +103,7 @@ /*! \externalpage https://bugzilla.mozilla.org/show_bug.cgi?id=594502 \title Firefox bug 594502 +*/ /* This prevents autolinking of each occurrence of 'WebSocket' |