diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-19 16:47:12 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-19 16:47:12 +0000 |
| commit | d8dca33dc3f9e3e09ec047a083c467ce12dca266 (patch) | |
| tree | 9e345d0747488397a4a2a726ac43e2ff7a3178a5 /LICENSE | |
| parent | 04c294766450a8660f0a737b4ff5613bde4e44c2 (diff) | |
Merged revisions 132312 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r132312 | kpfleming | 2008-07-19 11:46:33 -0500 (Sat, 19 Jul 2008) | 10 lines
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/branches/1.6.0@132313 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 |