[asterisk-commits] kpfleming: branch 1.4 r82335 - in /branches/1.4: ./ LICENSE

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Thu Sep 13 13:12:00 2007
New Revision: 82335

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82335
Log:
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:
    branches/1.4/   (props changed)
    branches/1.4/LICENSE

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

Modified: branches/1.4/LICENSE
URL: http://svn.digium.com/view/asterisk/branches/1.4/LICENSE?view=diff&rev=82335&r1=82334&r2=82335
==============================================================================
--- branches/1.4/LICENSE (original)
+++ branches/1.4/LICENSE Thu Sep 13 13:12:00 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