From: Jeff Peeler <jpeeler@digium.com>
Date: Wed, 30 Dec 2009 20:25:58 +0000 (+0000)
Subject: Blocked revisions 236890 via svnmerge
X-Git-Tag: 11.0.0-beta1~3685
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d344d8d947ed61589e33b1aebc4db9f0323e4975;p=thirdparty%2Fasterisk.git

Blocked revisions 236890 via svnmerge

........
  r236890 | jpeeler | 2009-12-30 14:25:11 -0600 (Wed, 30 Dec 2009) | 2 lines

  Remove conflicting function definitions (asterisk.h) so LOW_MEMORY compiles.
........


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