[asterisk-commits] lmadsen: trunk r301732 - in /trunk: ./ configs/phoneprov.conf.sample

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Thu Jan 13 11:02:34 2011
New Revision: 301732

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=301732
Log:
Merged revisions 301731 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301731 | lmadsen | 2011-01-13 11:01:43 -0600 (Thu, 13 Jan 2011) | 15 lines
  
  Merged revisions 301730 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r301730 | lmadsen | 2011-01-13 11:01:11 -0600 (Thu, 13 Jan 2011) | 7 lines
    
    Add static entry for split Polycom 332 firmware.
    
    (closes issue #18607)
    Reported by: cjacobsen
    Patches: 
          polycom_331.diff uploaded by cjacobsen (license 1029)
    Tested by: lathama
  ........
................

Modified:
    trunk/   (props changed)
    trunk/configs/phoneprov.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configs/phoneprov.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/phoneprov.conf.sample?view=diff&rev=301732&r1=301731&r2=301732
==============================================================================
--- trunk/configs/phoneprov.conf.sample (original)
+++ trunk/configs/phoneprov.conf.sample Thu Jan 13 11:02:34 2011
@@ -94,6 +94,8 @@
 static_file => 2345-12200-004.sip.ld,application/octet-stream
 static_file => 2345-12200-005.bootrom.ld,application/octet-stream
 static_file => 2345-12200-005.sip.ld,application/octet-stream
+static_file => 2345-12365-001.bootrom.ld,application/octet-stream
+static_file => 2345-12365-001.sip.ld,application/octet-stream
 static_file => 2345-12500-001.bootrom.ld,application/octet-stream
 static_file => 2345-12500-001.sip.ld,application/octet-stream
 static_file => 2345-12560-001.bootrom.ld,application/octet-stream