From: Kevin P. Fleming Date: Tue, 17 Oct 2006 17:22:52 +0000 (+0000) Subject: Merged revisions 45327 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~4388 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75ae42ff30d8ee1e3ca282124ce4428c281cf4c4;p=thirdparty%2Fasterisk.git Merged revisions 45327 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r45327 | kpfleming | 2006-10-17 12:22:25 -0500 (Tue, 17 Oct 2006) | 10 lines 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 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45328 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/LICENSE b/LICENSE index 8d37096f99..a1bf9d88a6 100644 --- a/LICENSE +++ b/LICENSE @@ -5,6 +5,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 package, and therefore can grant, at its sole discretion, the ability