[svn-commits] oej: branch 1.6.2 r289950 - in /branches/1.6.2: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: oej
Date: Sat Oct  2 03:52:03 2010
New Revision: 289950

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=289950
Log:
Merged revisions 289949 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r289949 | oej | 2010-10-02 10:50:05 +0200 (Lör, 02 Okt 2010) | 2 lines
  
  Add documentation for undocumented option to AMI action originate
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/manager.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/manager.c?view=diff&rev=289950&r1=289949&r2=289950
==============================================================================
--- branches/1.6.2/main/manager.c (original)
+++ branches/1.6.2/main/manager.c Sat Oct  2 03:52:03 2010
@@ -2432,6 +2432,7 @@
 "	Timeout: How long to wait for call to be answered (in ms. Default: 30000)\n"
 "	CallerID: Caller ID to be set on the outgoing channel\n"
 "	Variable: Channel variable to set, multiple Variable: headers are allowed\n"
+"	Codecs: Comma-separated list of codecs to use for the new channels\n"
 "	Account: Account code\n"
 "	Async: Set to 'true' for fast origination\n";