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

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Tue Oct 17 12:22:25 2006
New Revision: 45327

URL: http://svn.digium.com/view/asterisk?rev=45327&view=rev
Log:
Merged revisions 45326 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r45326 | kpfleming | 2006-10-17 12:22:01 -0500 (Tue, 17 Oct 2006) | 2 lines

provide licensing language for IAXy firmware file

........

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?rev=45327&r1=45326&r2=45327&view=diff
==============================================================================
--- branches/1.4/LICENSE (original)
+++ branches/1.4/LICENSE Tue Oct 17 12:22:25 2006
@@ -4,6 +4,18 @@
 applies to all loadable Asterisk modules used on your system as well,
 except as defined below. The GPL (version 2) is included in this
 source tree in the file COPYING.
+
+This package also includes various components that are not part of
+Asterisk itself; these components are in the 'contrib' directory
+and its subdirectories. Most of these components are also
+distributed under the GPL version 2 as well, except for the following:
+
+contrib/firmware/iax/iaxy.bin:
+	This file is Copyright (C) Digium, Inc. and is licensed for
+	use with Digium IAXy hardware devices only. It can be
+	distributed freely as long as the distribution is in the
+	original form present in this package (not reformatted or
+	modified).
 
 Digium, Inc. (formerly Linux Support Services) holds copyright
 and/or sufficient licenses to all components of the Asterisk