Automerge Script 3dbf6e09a7 automerge commit ...

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

2007-04-06 15:54:39 +00:00

..

gsm

automerge commit

2006-07-24 18:02:36 +00:00

ilbc

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

lpc10

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

adpcm_slin_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

codec_a_mu.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

codec_adpcm.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

codec_alaw.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

codec_g723_1.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

codec_g726.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

codec_gsm.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

codec_ilbc.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

codec_lpc10.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

codec_speex.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

codec_ulaw.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

codec_zap.c

automerge commit

2007-04-06 15:54:39 +00:00

g723_slin_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

g726_slin_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

gsm_slin_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

ilbc_slin_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

log2comp.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

lpc10_slin_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

Makefile

merge up to branch 1.2 and re-enable automerge

2007-02-08 22:48:47 +00:00

slin_adpcm_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

slin_g723_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

slin_g726_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

slin_gsm_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

slin_ilbc_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

slin_lpc10_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

slin_speex_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

slin_ulaw_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

speex_slin_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

ulaw_slin_ex.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00