[asterisk-commits] lmadsen: branch 1.6.1 r193547 - in /branches/1.6.1: ./ funcs/func_channel.c

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Mon May 11 13:07:51 2009
New Revision: 193547

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=193547
Log:
Recorded merge of revisions 193545 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r193545 | lmadsen | 2009-05-11 14:01:44 -0400 (Mon, 11 May 2009) | 14 lines
  
  Recorded merge of revisions 193544 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r193544 | lmadsen | 2009-05-11 13:35:17 -0400 (Mon, 11 May 2009) | 7 lines
    
    Document CHANNEL(transfercapability) in CLI documentation.
    
    (issue #15073)
    Reported by: pkempgen
    Patches:
          20090511__issue15073.diff.txt uploaded by tilghman (license 14)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/funcs/func_channel.c

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

Modified: branches/1.6.1/funcs/func_channel.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/funcs/func_channel.c?view=diff&rev=193547&r1=193546&r2=193547
==============================================================================
--- branches/1.6.1/funcs/func_channel.c (original)
+++ branches/1.6.1/funcs/func_channel.c Mon May 11 13:07:51 2009
@@ -183,6 +183,8 @@
 		"R/W	rxgain             set rxgain level on channel drivers that support it\n"
 		"R/O	state              state for channel\n"
 		"R/W	tonezone           zone for indications played\n"
+		"R/W	transfercapability ISDN transfer capability (one of SPEECH, DIGITAL,\n"
+		"                          RESTRICTED_DIGITAL, 3K1AUDIO, DIGITAL_W_TONES, or VIDEO).\n"
 		"R/W	txgain             set txgain level on channel drivers that support it\n"
 		"R/O	videonativeformat  format used natively for video\n"
 #ifdef CHANNEL_TRACE