[svn-commits] russell: branch 1.6.0 r135538 - in /branches/1.6.0: ./ configs/

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Aug  4 15:15:46 2008
New Revision: 135538

URL: http://svn.digium.com/view/asterisk?view=rev&rev=135538
Log:
Merged revisions 135537 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r135537 | russell | 2008-08-04 15:15:27 -0500 (Mon, 04 Aug 2008) | 10 lines

Merged revisions 135536 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135536 | russell | 2008-08-04 15:15:03 -0500 (Mon, 04 Aug 2008) | 2 lines

fix a config sample typo

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configs/chan_dahdi.conf.sample

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

Modified: branches/1.6.0/configs/chan_dahdi.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/chan_dahdi.conf.sample?view=diff&rev=135538&r1=135537&r2=135538
==============================================================================
--- branches/1.6.0/configs/chan_dahdi.conf.sample (original)
+++ branches/1.6.0/configs/chan_dahdi.conf.sample Mon Aug  4 15:15:46 2008
@@ -804,7 +804,7 @@
 ; different context and use E & M signalling instead.
 ;
 ;context=remote
-;sigalling=em
+;signaling=em
 ;channel => 15
 ;channel => 16