kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

merging the zap_and_dahdi_trunk branch up to trunk

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@134050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-07-28 16:00:19 +00:00
parent 4c372e41a2
commit 06d951f585
4 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_meetme.c
View File

@@ -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",