[svn-commits] mmichelson: branch 1.6.1 r250732 - in /branches/1.6.1: ./ funcs/func_channel.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Mar  4 14:14:19 2010
New Revision: 250732

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=250732
Log:
Recorded merge of revisions 250730 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r250730 | mmichelson | 2010-03-04 14:12:26 -0600 (Thu, 04 Mar 2010) | 3 lines
  
  Adjust XML for func_channel to indicate that rtpdest can take a "text" argument.
........

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://svnview.digium.com/svn/asterisk/branches/1.6.1/funcs/func_channel.c?view=diff&rev=250732&r1=250731&r2=250732
==============================================================================
--- branches/1.6.1/funcs/func_channel.c (original)
+++ branches/1.6.1/funcs/func_channel.c Thu Mar  4 14:14:19 2010
@@ -233,6 +233,7 @@
 		"  Argument 1:\n"
 		"    audio                 Get audio destination\n"
 		"    video                 Get video destination\n"
+		"    text                  Get text destination\n"
 		"\n"
 		"chan_iax2 provides the following additional options:\n"
 		"R/O    peerip             Get the peer's ip address\n"