From: Mark Michelson <mmichelson@digium.com>
Date: Fri, 20 Mar 2009 16:32:39 +0000 (+0000)
Subject: Blocked revisions 183553-183555 via svnmerge
X-Git-Tag: 1.6.1.0-rc4~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9190b836957570b56911f83b9d7b7bd8b980ad4c;p=thirdparty%2Fasterisk.git

Blocked revisions 183553-183555 via svnmerge

........
  r183553 | mmichelson | 2009-03-20 11:19:53 -0500 (Fri, 20 Mar 2009) | 5 lines

  Add some missing symbols to main/asterisk.exports

  Hey! chan_sip.so loads now!
........
  r183554 | mmichelson | 2009-03-20 11:24:20 -0500 (Fri, 20 Mar 2009) | 3 lines

  Remove symbols I just added to main/asterisk.exports and instead rename the functions.
........
  r183555 | mmichelson | 2009-03-20 11:25:17 -0500 (Fri, 20 Mar 2009) | 3 lines

  Fix chan_sip so it builds.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@183557 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---