[svn-commits] russell: branch 1.6.0 r118963 - in /branches/1.6.0: ./ apps/app_milliwatt.c

[SVN commits to the Digium repositories]

Author: russell
Date: Thu May 29 12:52:21 2008
New Revision: 118963

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

................
r118962 | russell | 2008-05-29 12:52:00 -0500 (Thu, 29 May 2008) | 11 lines

Merged revisions 118961 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r118961 | russell | 2008-05-29 12:51:29 -0500 (Thu, 29 May 2008) | 3 lines

 - Mark app_milliwatt dependent on res_indications (thanks to jsmith)
 - fix a typo in a log message (thanks to qwell)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_milliwatt.c

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

Modified: branches/1.6.0/apps/app_milliwatt.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_milliwatt.c?view=diff&rev=118963&r1=118962&r2=118963
==============================================================================
--- branches/1.6.0/apps/app_milliwatt.c (original)
+++ branches/1.6.0/apps/app_milliwatt.c Thu May 29 12:52:21 2008
@@ -24,6 +24,10 @@
  * 
  * \ingroup applications
  */
+
+/*** MODULEINFO
+	<depend>res_indications</depend>
+ ***/
 
 #include "asterisk.h"
 
@@ -142,7 +146,7 @@
 	}
 
 	if (!(wait_app = pbx_findapp("Wait"))) {
-		ast_log(LOG_ERROR, "The Playtones application is required to run Milliwatt()\n");
+		ast_log(LOG_ERROR, "The Wait application is required to run Milliwatt()\n");
 		return -1;
 	}