From ae1eb91abecf3d441295824fa3a2b7262ff8c941 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Wed, 25 Jun 2008 23:05:28 +0000 Subject: Merged revisions 125132 via svnmerge from 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: http://svn.digium.com/svn/asterisk/trunk@125138 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_meetme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/app_meetme.c') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index fc0a08ae0..25cc0727e 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -37,7 +37,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include "asterisk/dahdi.h" +#include #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" -- cgit v1.2.3