Merged revisions 46370 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Fri, 27 Oct 2006 19:04:34 +0000 (19:04 +0000)
committerRussell Bryant <russell@russellbryant.com>
Fri, 27 Oct 2006 19:04:34 +0000 (19:04 +0000)
commit955f1ef0fe65d9b9ef5a498d37c72ae8112df72c
tree1b7e140efd7e40b8659ea9e6fdbe20e6543ef01b
parent95a4fc7af2a0cc7f88fea9d5bfdba465afab4d1d
Merged revisions 46370 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r46370 | russell | 2006-10-27 14:03:32 -0500 (Fri, 27 Oct 2006) | 4 lines

move the copy of the default settings to the global settings back out of
process_zap, so that they aren't overwritten when process_zap is called
multiple times

........

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