Cancel destroy request on new invite, merge bkw's control playback changes
authorMark Spencer <markster@digium.com>
Wed, 26 May 2004 22:18:59 +0000 (22:18 +0000)
committerMark Spencer <markster@digium.com>
Wed, 26 May 2004 22:18:59 +0000 (22:18 +0000)
commitfdb8ffe20d5b89f75cb1b525f1787a909000bdd8
treefd07c0b0be998957a1c1247a4531db0172721472
parentf7a7158f3fab29da5e5a5d78b4d9886b37c407e8
Cancel destroy request on new invite, merge bkw's control playback changes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3084 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_controlplayback.c
channels/chan_sip.c