[asterisk-commits] russell: trunk r57147 - in /trunk: ./
apps/app_meetme.c
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Wed Feb 28 12:59:26 MST 2007
Author: russell
Date: Wed Feb 28 13:59:26 2007
New Revision: 57147
URL: http://svn.digium.com/view/asterisk?view=rev&rev=57147
Log:
Merged revisions 57146 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r57146 | russell | 2007-02-28 13:58:56 -0600 (Wed, 28 Feb 2007) | 2 lines
Minor formatting change
........
Modified:
trunk/ (props changed)
trunk/apps/app_meetme.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=57147&r1=57146&r2=57147
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed Feb 28 13:59:26 2007
@@ -1011,13 +1011,13 @@
ast_cli(fd, "=== ---------------------------------------------------------\n"
"=== Trunk Name: %s\n"
"=== ==> Device: %s\n"
- "=== ==> AutoContext: %s\n"
- "=== ==> RingTimeout: %s\n"
- "=== ==> BargeAllowed: %s\n"
- "=== ==> Stations ...\n",
- trunk->name, trunk->device,
- S_OR(trunk->autocontext, "(none)"),
- ring_timeout,
+ "=== ==> AutoContext: %s\n"
+ "=== ==> RingTimeout: %s\n"
+ "=== ==> BargeAllowed: %s\n"
+ "=== ==> Stations ...\n",
+ trunk->name, trunk->device,
+ S_OR(trunk->autocontext, "(none)"),
+ ring_timeout,
trunk->barge_disabled ? "No" : "Yes");
AST_RWLIST_RDLOCK(&sla_stations);
AST_LIST_TRAVERSE(&trunk->stations, station_ref, entry)
More information about the asterisk-commits
mailing list