[asterisk-commits] trunk r31322 - in /trunk: ./ configs/sip.conf.sample

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Jun  1 07:43:01 2006
New Revision: 31322

URL: http://svn.digium.com/view/asterisk?rev=31322&view=rev
Log:
Merged revisions 31321 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r31321 | kpfleming | 2006-06-01 07:41:47 -0500 (Thu, 01 Jun 2006) | 2 lines

remove a sample entry that never should have been added (code to support it was not merged)

........

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

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

Modified: trunk/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/sip.conf.sample?rev=31322&r1=31321&r2=31322&view=diff
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Thu Jun  1 07:43:01 2006
@@ -460,7 +460,6 @@
 ;allow=alaw
 ;allow=g723.1			; Asterisk only supports g723.1 pass-thru!
 ;allow=g729			; Pass-thru only unless g729 license obtained
-;astdb=chan2ext/SIP/grandstream1=1234	; ensures an astDB entry exists
 ;callingpres=allowed_passed_screen	; Set caller ID presentation
 				; See README.callingpres for more information