[asterisk-commits] jpeeler: branch 1.6.0 r245093 - in /branches/1.6.0: ./ LICENSE contrib/firmware/

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri Feb  5 13:26:44 2010
New Revision: 245093

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=245093
Log:
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
  ........
................

Removed:
    branches/1.6.0/contrib/firmware/
Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/LICENSE

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/LICENSE
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/LICENSE?view=diff&rev=245093&r1=245092&r2=245093
==============================================================================
--- branches/1.6.0/LICENSE (original)
+++ branches/1.6.0/LICENSE Fri Feb  5 13:26:44 2010
@@ -7,15 +7,8 @@
 
 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