diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-28 16:00:19 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-28 16:00:19 +0000 |
| commit | f76a823f67909ab70af23bdb74d143120ed9b7b3 (patch) | |
| tree | f54c744da738790027a3a283aca0ca09dec29679 /apps/app_meetme.c | |
| parent | f4056d9f182741f9ffc297f661ec2bc68f821939 (diff) | |
merging the zap_and_dahdi_trunk branch up to trunk
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@134050 f38db490-d61c-443f-a65b-d21fe96a405b
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", |