[asterisk-commits] russell: branch 1.6.0 r168483 - in /branches/1.6.0: ./ configs/

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Jan 12 08:58:38 2009
New Revision: 168483

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

................
r168481 | russell | 2009-01-12 08:57:49 -0600 (Mon, 12 Jan 2009) | 10 lines

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

........
r168480 | russell | 2009-01-12 08:57:27 -0600 (Mon, 12 Jan 2009) | 2 lines

s/ringdance/ringcadence/ for Bulgaria

........

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

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

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

Modified: branches/1.6.0/configs/indications.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/configs/indications.conf.sample?view=diff&rev=168483&r1=168482&r2=168483
==============================================================================
--- branches/1.6.0/configs/indications.conf.sample (original)
+++ branches/1.6.0/configs/indications.conf.sample Mon Jan 12 08:58:38 2009
@@ -117,7 +117,7 @@
 [bg]
 ; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf
 description = Bulgaria
-ringdance = 1000,4000
+ringcadence = 1000,4000
 ;
 dial = 425
 busy = 425/500,0/500