More merges from resolve-shadow warnings:
[asterisk/asterisk.git] / codecs / adpcm_slin_ex.h
2005-11-29 Kevin P. Flemingremove extraneous svn:executable properties
2005-10-26 Russell Bryantmore doxygenification (issue #5513)
2001-03-20 Mark SpencerVersion 0.1.7 from FTP