From: Russell Bryant Date: Wed, 28 Feb 2007 19:59:26 +0000 (+0000) Subject: Merged revisions 57146 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~3086 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00ab6324e87476bafb6a381093b48ffd8148825a;p=thirdparty%2Fasterisk.git 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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57147 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_meetme.c b/apps/app_meetme.c index c385ab2976..8f473a4fad 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1011,13 +1011,13 @@ static int sla_show_trunks(int fd, int argc, char **argv) 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)