aboutsummaryrefslogtreecommitdiff
path: root/docs/LICENSE-MIXING
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2011-01-21 14:27:10 -0800
committerDan Fandrich <dan@coneharvesters.com>2011-01-21 14:27:10 -0800
commit3427bece89ee00fdf82519e584a971f97c9f2071 (patch)
treed7bc20f1208643d0c33a2460418ee451936ddbce /docs/LICENSE-MIXING
parente79c1e39e9e727089379dc3bc46b1d4250180048 (diff)
Mention axTLS in some more documentation
Diffstat (limited to 'docs/LICENSE-MIXING')
-rw-r--r--docs/LICENSE-MIXING4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/LICENSE-MIXING b/docs/LICENSE-MIXING
index 3db1a3d7f..f596546da 100644
--- a/docs/LICENSE-MIXING
+++ b/docs/LICENSE-MIXING
@@ -55,6 +55,10 @@ NSS http://www.mozilla.org/projects/security/pki/nss/
grant you different permissions and impose different obligations. You
should select the license that best meets your needs.
+axTLS http://axtls.sourceforge.net/
+
+ (May be used for SSL/TLS support) Uses a Modified BSD-style license.
+
c-ares http://daniel.haxx.se/projects/c-ares/license.html
(Used for asynchronous name resolves) Uses an MIT license that is very