[asterisk-commits] branch oej/iptos r11977 - in /team/oej/iptos: ./ configs/zapata.conf.sample

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Mar  6 01:27:57 2006
New Revision: 11977

URL: http://svn.digium.com/view/asterisk?rev=11977&view=rev
Log:
Reset automerging

Modified:
    team/oej/iptos/   (props changed)
    team/oej/iptos/configs/zapata.conf.sample

Propchange: team/oej/iptos/
------------------------------------------------------------------------------
    automerge = run

Propchange: team/oej/iptos/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/iptos/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar  6 01:27:57 2006
@@ -1,1 +1,1 @@
-/trunk:1-11907
+/trunk:1-11976

Modified: team/oej/iptos/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/iptos/configs/zapata.conf.sample?rev=11977&r1=11976&r2=11977&view=diff
==============================================================================
--- team/oej/iptos/configs/zapata.conf.sample (original)
+++ team/oej/iptos/configs/zapata.conf.sample Mon Mar  6 01:27:57 2006
@@ -444,7 +444,7 @@
 ;callprogress=yes
 ;progzone=us
 ;
-; FXO (FXS signalled) devices must have a timeout to determine whe there was a
+; FXO (FXS signalled) devices must have a timeout to determine if there was a
 ; hangup before the line was answered.  This value can be tweaked to shorten
 ; how long it takes before Zap considers a non-ringing line to have hungup.
 ;