kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 125132 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r125132 | kpfleming | 2008-06-25 17:21:30 -0500 (Wed, 25 Jun 2008) | 10 lines

allow tonezone to live in a different place than DAHDI/Zaptel, since dahdi-tools and dahdi-linux are now separate packages and can be installed in different places

don't include tonezone.h in dahdi_compat.h, because only a couple of modules need it

get app_rpt building again after the DAHDI changes

(closes issue #12911)
Reported by: tzafrir


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125138 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2008-06-25 23:05:28 +00:00
parent 14e78bbc6d
commit fd4a60c459
16 changed files with 25 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_meetme.c
View File

@@ -37,7 +37,7 @@
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/dahdi.h"
#include <dahdi/user.h>
#include "asterisk/lock.h"
#include "asterisk/file.h"
@@ -292,7 +292,7 @@ static const char *descrip2 =
"will be returned in the variable. Upon app completion, MeetMeCount will hangup\n"
"the channel, unless priority n+1 exists, in which case priority progress will\n"
"continue.\n"
"A ZAPTEL INTERFACE MUST BE INSTALLED FOR CONFERENCING FUNCTIONALITY.\n";
"";
static const char *descrip3 =
" MeetMeAdmin(confno,command[,user]): Run admin command for conference\n"