[asterisk-commits] pabelanger: branch 1.6.2 r271090 - in /branches/1.6.2: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Wed Jun 16 19:32:06 2010
New Revision: 271090

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=271090
Log:
Merged revisions 271089 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r271089 | pabelanger | 2010-06-16 20:30:51 -0400 (Wed, 16 Jun 2010) | 5 lines
  
  option w[(secs)] incorrectly capitalized in xmldoc
  
  (closes issue #17516)
  Reported by: karlfife
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_meetme.c

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

Modified: branches/1.6.2/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_meetme.c?view=diff&rev=271090&r1=271089&r2=271090
==============================================================================
--- branches/1.6.2/apps/app_meetme.c (original)
+++ branches/1.6.2/apps/app_meetme.c Wed Jun 16 19:32:06 2010
@@ -160,7 +160,7 @@
 					<option name="T">
 						<para>Set talker detection (sent to manager interface and meetme list).</para>
 					</option>
-					<option name="W" hasparams="optional">
+					<option name="w" hasparams="optional">
 						<para>Wait until the marked user enters the conference.</para>
 						<argument name="secs" required="true" />
 					</option>