From f76a823f67909ab70af23bdb74d143120ed9b7b3 Mon Sep 17 00:00:00 2001 From: mmichelson Date: Mon, 28 Jul 2008 16:00:19 +0000 Subject: 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 --- apps/app_meetme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apps/app_meetme.c') 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", -- cgit v1.2.3