]> git.ipfire.org Git - thirdparty/asterisk.git/commit
automerge commit
authorAutomerge Script <automerge@asterisk.org>
Mon, 22 Jan 2007 20:27:07 +0000 (20:27 +0000)
committerAutomerge Script <automerge@asterisk.org>
Mon, 22 Jan 2007 20:27:07 +0000 (20:27 +0000)
commit5030563084cb85d823cb4fd9269ca9e9787aa906
treee21758e92cc94eda02d9712ac572b476c9d12ec7
parenta4e9dffea0e60972e94063ad402d4957695197d2
automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@51455 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_mixmonitor.c
codecs/Makefile
codecs/codec_zap.c [new file with mode: 0644]