[Asterisk-cvs] asterisk/configs features.conf.sample,1.6,1.7

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/configs
In directory mongoose.digium.com:/tmp/cvs-serv19699/configs

Modified Files:
	features.conf.sample 
Log Message:
Merge Tony's attended # transfer with changes (bug #3241)


Index: features.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/features.conf.sample,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- features.conf.sample	4 Jan 2005 04:01:40 -0000	1.6
+++ features.conf.sample	5 Jan 2005 19:56:47 -0000	1.7
@@ -17,5 +17,7 @@
 				; feature activation.  Default is 500
 
 [featuremap]
-;blindxfer => #			; Blind transfer
-;disconnect => *		; Disconnect
+;blindxfer => #1		; Blind transfer
+;disconnect => *0		; Disconnect
+;automon => *1			; One Touch Record
+;atxfer => *2			; Attended transfer