diff options
| author | Mark Michelson <mmichelson@digium.com> | 2008-07-28 16:00:19 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2008-07-28 16:00:19 +0000 |
| commit | 06d951f58588d6713a71d2aa689a07e2af70254e (patch) | |
| tree | f54c744da738790027a3a283aca0ca09dec29679 /apps/app_meetme.c | |
| parent | 4c372e41a2658e7f3bf8f2928dc761c0b1a78f25 (diff) | |
merging the zap_and_dahdi_trunk branch up to trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index ee158b1fe..1c55bb6dd 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1927,7 +1927,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c ast_mutex_unlock(&conf->playlock); goto outrun; } - ast_debug(1, "Placed channel %s in ZAP conf %d\n", chan->name, conf->dahdiconf); + ast_debug(1, "Placed channel %s in DAHDI conf %d\n", chan->name, conf->dahdiconf); if (!sent_event) { manager_event(EVENT_FLAG_CALL, "MeetmeJoin", |