diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-19 16:46:33 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-19 16:46:33 +0000 |
commit | 6bd9f4518c7ab0d296c4d366db8016338d01474e (patch) | |
tree | 3c13eeac2e5f3314541e1f3aad20ba0b3cf76e4e /LICENSE | |
parent | ecc8396c544501bfe0874ba9c77595ec83edc461 (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: http://svn.digium.com/svn/asterisk/trunk@132312 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'LICENSE')
-rw-r--r-- | LICENSE | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |