diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-10-30 10:52:24 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-10-30 10:52:24 -0700 |
| commit | fcb6c33bac763d7a8246674eff33b599c28c1b6e (patch) | |
| tree | 15fc927f186a0de2476729a1c1e1906478f82e7e /third_party/websockify/LICENSE.txt | |
| parent | 5ba8486b1cd87d31f3d911cbfeb126717e0865b1 (diff) | |
update websockify to latest trunk
Diffstat (limited to 'third_party/websockify/LICENSE.txt')
| -rw-r--r-- | third_party/websockify/LICENSE.txt | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/third_party/websockify/LICENSE.txt b/third_party/websockify/LICENSE.txt index 916a77a0..f1648dec 100644 --- a/third_party/websockify/LICENSE.txt +++ b/third_party/websockify/LICENSE.txt @@ -1,11 +1,16 @@ websockify is licensed under the LGPL version 3 (see docs/LICENSE.GPL-3 and docs/LICENSE.LGPL-3) with the following exceptions: - include/base64.js : Choice of MIT 1.1, GPL-2 or LGPL-2.1 - - include/web-socket-js/ : New BSD license. Source code at + include/websock.js : MPL 2.0 + + include/base64.js : MPL 2.0 + + include/des.js : Various BSD style licenses + + include/web-socket-js/ : New BSD license (3-clause). Source code at https://github.com/gimite/web-socket-js other/kumina.c : Simplified BSD license (2 clause). Original source at https://github.com/kumina/wsproxy + |