summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2008-07-19 16:46:33 +0000
committerKevin P. Fleming <kpfleming@digium.com>2008-07-19 16:46:33 +0000
commit2fa3e85e4a28a2e5dd26168238921c8ebba67661 (patch)
tree3c13eeac2e5f3314541e1f3aad20ba0b3cf76e4e /LICENSE
parentfe246aa6739e7b305e83ca18ef1f2ece4d771540 (diff)
Merged revisions 132311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r132311 | kpfleming | 2008-07-19 11:45:52 -0500 (Sat, 19 Jul 2008) | 2 lines grant a license exception to allow distribution of Asterisk binaries that use the UW IMAP Toolkit (which is licensed under a non-GPL-compatible license) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@132312 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE4
1 files changed, 2 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index 39e0bb8ae..d1fe0ebe8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -31,8 +31,8 @@ there is no requirement that you provide the same exception in your
GPL'd products (although if you've written a module for Asterisk we
would strongly encourage you to make the same exception that we do).
-Specific permission is also granted to link Asterisk with OpenSSL and
-OpenH323 and distribute the resulting binary files.
+Specific permission is also granted to link Asterisk with OpenSSL, OpenH323
+and/or the UW IMAP Toolkit and distribute the resulting binary files.
In addition, Asterisk implements two management/control protocols: the
Asterisk Manager Interface (AMI) and the Asterisk Gateway Interface