Merge (for the time being) the alert code...
authorMark Spencer <markster@digium.com>
Wed, 18 Jun 2003 22:34:55 +0000 (22:34 +0000)
committerMark Spencer <markster@digium.com>
Wed, 18 Jun 2003 22:34:55 +0000 (22:34 +0000)
commit4c021fb72701b5040e287da2be4dd2fe1f809c78
treefd516940885dad8778c22dc715a3192f17e8a2b0
parenta5cee9d9175053218859651fd4b75b0f258d81a3
Merge (for the time being) the alert code...

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