[svn-commits] trunk r29407 - in /trunk: ./ apps/app_meetme.c

[svn-commits at lists.digium.com]

Author: tilghman
Date: Mon May 22 10:01:36 2006
New Revision: 29407

URL: http://svn.digium.com/view/asterisk?rev=29407&view=rev
Log:
Merged revisions 29398 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r29398 | tilghman | 2006-05-22 09:59:59 -0500 (Mon, 22 May 2006) | 2 lines

Bug 7194 - spelling fix

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

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

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?rev=29407&r1=29406&r2=29407&view=diff
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Mon May 22 10:01:36 2006
@@ -688,7 +688,7 @@
 					user->chan->name,
 					user->userflags & CONFFLAG_ADMIN ? "(Admin)" : "",
 					user->userflags & CONFFLAG_MONITOR ? "(Listen only)" : "",
-					user->adminflags & ADMINFLAG_MUTED ? "(Admn Muted)" : "",
+					user->adminflags & ADMINFLAG_MUTED ? "(Admin Muted)" : "",
 					istalking(user->talking), hr, min, sec);
 			else 
 				ast_cli(fd, "%d!%s!%s!%s!%s!%s!%s!%d!%02d:%02d:%02d\n",