[asterisk-commits] oej: trunk r289952 - in /trunk: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: oej
Date: Sat Oct  2 03:58:34 2010
New Revision: 289952

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

................
  r289951 | oej | 2010-10-02 10:56:08 +0200 (Lör, 02 Okt 2010) | 16 lines
  
  Merged revisions 289950 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r289950 | oej | 2010-10-02 10:52:03 +0200 (Lör, 02 Okt 2010) | 9 lines
    
    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:
    trunk/   (props changed)
    trunk/main/manager.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=289952&r1=289951&r2=289952
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Sat Oct  2 03:58:34 2010
@@ -440,6 +440,9 @@
 			</parameter>
 			<parameter name="Async">
 				<para>Set to <literal>true</literal> for fast origination.</para>
+			</parameter>
+			<parameter name="Codecs">
+				<para>Comma-separated list of codecs to use for this call.</para>
 			</parameter>
 		</syntax>
 		<description>