diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-01-23 01:51:22 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-01-23 01:51:22 +0000 |
| commit | 445abea012b7ccabea159ffac212665edb3a96cc (patch) | |
| tree | 82b46b93b5605263b5a42e156f05f3d3b132f104 /channels/chan_sip.c | |
| parent | fa6d3941dfa9d4911aa4237e202b3a1080250705 (diff) | |
No more conflicts on properties! svnmerge-block be gone!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51515 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
0 files changed, 0 insertions, 0 deletions