diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-13 18:12:00 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-13 18:12:00 +0000 |
| commit | 9485ff7560ed15d22103a13ec0c75fe4b8c7ba49 (patch) | |
| tree | 3ed1dbe60901500ded7bf13939e3388cb2317ef0 /LICENSE | |
| parent | 2477b79099e3c47319382688555f9633ca998bc1 (diff) | |
Merged revisions 82334 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r82334 | kpfleming | 2007-09-13 11:10:12 -0700 (Thu, 13 Sep 2007) | 2 lines
clarify the OpenSSL and OpenH323 license exceptions
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@82335 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -32,7 +32,7 @@ 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. +OpenH323 and distribute the resulting binary files. In addition, Asterisk implements two management/control protocols: the Asterisk Manager Interface (AMI) and the Asterisk Gateway Interface |