From: Kevin P. Fleming <kpfleming@digium.com>
Date: Tue, 22 Jul 2008 22:11:12 +0000 (+0000)
Subject: Blocked revisions 132787 via svnmerge
X-Git-Tag: 1.6.2.0-beta1~1616
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad33b7c219788cb65116672e81be118fd096be35;p=thirdparty%2Fasterisk.git

Blocked revisions 132787 via svnmerge

........
r132787 | kpfleming | 2008-07-22 17:11:01 -0500 (Tue, 22 Jul 2008) | 5 lines

fix up namespace pollution for dahdi_chan_mode enum

correct registration of AMI actions in chan_dahdi; in zap-only mode, only register the Zap flavors of the actions (and use Zap prefixes for headers and acks), but in dahdi+zap mode, register both Zap and DAHDI flavors of actions


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@132788 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---