[asterisk-commits] kpfleming: trunk r82336 - in /trunk: ./ LICENSE

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Thu Sep 13 13:13:44 2007
New Revision: 82336

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82336
Log:
Merged revisions 82335 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r82335 | kpfleming | 2007-09-13 11:12:00 -0700 (Thu, 13 Sep 2007) | 10 lines

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

........

................

Modified:
    trunk/   (props changed)
    trunk/LICENSE

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/LICENSE
URL: http://svn.digium.com/view/asterisk/trunk/LICENSE?view=diff&rev=82336&r1=82335&r2=82336
==============================================================================
--- trunk/LICENSE (original)
+++ trunk/LICENSE Thu Sep 13 13:13:44 2007
@@ -32,7 +32,7 @@
 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