diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-05 19:26:44 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-05 19:26:44 +0000 |
| commit | fc161f9b0936ac4e5f6a7e20de61777d2f5624e4 (patch) | |
| tree | aa2a0777308535b1ac385332f46e9d3462757898 /LICENSE | |
| parent | 35beb4d8d25348e87125ed78286645407135ec2a (diff) | |
Merged revisions 245090 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r245090 | jpeeler | 2010-02-05 13:26:22 -0600 (Fri, 05 Feb 2010) | 11 lines
Merged revisions 245044 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r245044 | kpfleming | 2010-02-05 12:32:29 -0600 (Fri, 05 Feb 2010) | 5 lines
Remove contrib/firmware directory as it is empty
Remove explicit license for IAXy firmware as it is no longer included in the tree
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@245093 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 11 |
1 files changed, 2 insertions, 9 deletions
@@ -7,15 +7,8 @@ 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). +and its subdirectories. These components are also distributed under the +GPL version 2 as well. Digium, Inc. (formerly Linux Support Services) holds copyright and/or sufficient licenses to all components of the Asterisk |