diff options
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-17 17:22:52 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-17 17:22:52 +0000
commitb6e0ce41a330535ea6d082427fba962a5bdd2f5b (patch)
parent7673e5c24ac11e48cb3c10d8831813bdac19a5bf (diff)
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: http://svn.digium.com/svn/asterisk/trunk@45328 f38db490-d61c-443f-a65b-d21fe96a405b
1 files changed, 12 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 8d37096f9..a1bf9d88a 100644
@@ -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:
+ 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