aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-28 18:41:23 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-28 18:41:23 +0000
commit7a7308449b5146348e96bdb45e48b08ea69a97ad (patch)
treed1352a5fb4fabf2bc7e7826e43bea9085b93e5f9 /channels
parent9014a61313c750913e417105a05ea4ac41eb5ab1 (diff)
Merge rev 100626 from Asterisk 1.4. The svnmerge of this commit was a NoOp, since
res_features doesn't exist in trunk. Thanks to qwell for pointing it out! git-svn-id: http://svn.digium.com/svn/asterisk/trunk@100631 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
0 files changed, 0 insertions, 0 deletions