[asterisk-commits] twilson: branch 1.6.0 r172637 - in /branches/1.6.0: ./ configs/

[SVN commits to the Asterisk project]

Author: twilson
Date: Fri Jan 30 18:06:27 2009
New Revision: 172637

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

........
  r172581 | twilson | 2009-01-30 15:50:03 -0600 (Fri, 30 Jan 2009) | 2 lines
  
  Remove incorret line from sample config
........

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

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

Modified: branches/1.6.0/configs/features.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/configs/features.conf.sample?view=diff&rev=172637&r1=172636&r2=172637
==============================================================================
--- branches/1.6.0/configs/features.conf.sample (original)
+++ branches/1.6.0/configs/features.conf.sample Fri Jan 30 18:06:27 2009
@@ -21,8 +21,6 @@
 ;parkedcalltransfers = caller   ; Enables or disables DTMF based transfers when picking up a parked call.
                                 ; one of: callee, caller, both, no (default is no)
 ;parkedcallreparking = caller   ; Enables or disables DTMF based parking when picking up a parked call.
-                                ; one of: callee, caller, both, no (default is no)
-;parkedcallparking = caller     ; Enables or disables DTMF based one-touch parking when picking up a parked call.
                                 ; one of: callee, caller, both, no (default is no)
 ;parkedcallhangup = caller      ; Enables or disables DTMF based hangups when picking up a parked call.
                                 ; one of: callee, caller, both, no (default is no)