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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@245093 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/LICENSE b/LICENSE
index fe253c2ef17af6c00fe8760c7af90246661ecbcb..d530d18c178a96f0a93db7ecf3de8acfe392d21d 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -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