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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
18 years ago · 27e5a84477
parent 3a0cc21c4f
commit 27e5a84477
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -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