From: Automerge script Date: Mon, 30 Jul 2012 15:20:33 +0000 (+0000) Subject: Merged revisions 370547 via svnmerge from X-Git-Tag: 10.8.0-digiumphones-rc1~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec96eda533c3717c7c3f218c0fb3e1734171c7e2;p=thirdparty%2Fasterisk.git Merged revisions 370547 via svnmerge from file:///srv/subversion/repos/asterisk/branches/10 ........ r370547 | jrose | 2012-07-30 09:50:34 -0500 (Mon, 30 Jul 2012) | 5 lines app_meetme: Change app_meetme support level to extended from deprecated (closes issue ASTERISK-20134) Reported by: Leif Madsen ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@370555 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 588c3d6851..a087e85605 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -32,7 +32,7 @@ /*** MODULEINFO dahdi no - deprecated + extended app_confbridge ***/