[asterisk-dev] iLBC source code conflict

[Matthew Jordan]

As part of ASTERISK-18943, the IETF-derived source code for the iLBC codec
was included for distribution with Asterisk.  As the source code was previously
generated using the get_ilb_source.sh script and placed in the same directory,
performing an svn update in an already checked out branch of 1.8, 10, or trunk
may result in a conflict.  If you have run this script and placed the resulting
source code in the codecs/ilbc folder, you may be unable to update the checked
out branches.

To resolve this, simply remove the contents of your codecs/ilbc folder and perform
an svn update.  (The Makefile was previously the only item under source control;
it will be restored via the svn update)

Matthew Jordan
Digium, Inc. | Software Developer
445 Jan Davis Drive NW - Huntsville, AL 35806 - USA
Check us out at: http://digium.com & http://asterisk.org