Automerge script 4469bcc1a2 automerge commit ...

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

2006-07-13 17:02:17 +00:00

..

h323

remove extraneous svn:executable properties

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

misdn

automerge commit

2006-03-12 19:05:14 +00:00

adtranvofr.h

remove extraneous svn:executable properties

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

answer.h

remove extraneous svn:executable properties

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

chan_agent.c

automerge commit

2006-07-06 21:01:31 +00:00

chan_alsa.c

Allow a chan_alsa that failed to open sound devices to be unloaded.

2005-12-21 20:01:16 +00:00

chan_features.c

automerge commit

2006-07-03 05:04:12 +00:00

chan_h323.c

automerge commit

2006-07-03 05:04:12 +00:00

chan_iax2.c

automerge commit

2006-07-12 16:02:19 +00:00

chan_local.c

automerge commit

2006-07-03 05:04:12 +00:00

chan_mgcp.c

automerge commit

2006-07-03 05:04:12 +00:00

chan_misdn_config.c

* Added mISDN/mISDNuser Echo cancel Patch

2005-12-15 10:52:30 +00:00

chan_misdn.c

automerge commit

2006-07-03 05:04:12 +00:00

chan_modem_aopen.c

remove extraneous svn:executable properties

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

chan_modem_bestdata.c

remove extraneous svn:executable properties

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

chan_modem_i4l.c

remove extraneous svn:executable properties

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

chan_modem.c

automerge commit

2006-07-12 14:02:32 +00:00

chan_nbs.c

remove extraneous svn:executable properties

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

chan_oss_old.c

remove extraneous svn:executable properties

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

chan_oss.c

automerge commit

2006-07-05 16:04:30 +00:00

chan_phone.c

automerge commit

2006-07-03 05:04:12 +00:00

chan_sip.c

automerge commit

2006-07-13 17:02:17 +00:00

chan_skinny.c

automerge commit

2006-07-03 05:04:12 +00:00

chan_vpb.c

remove extraneous svn:executable properties

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

chan_zap.c

automerge commit

2006-07-12 14:02:32 +00:00

DialTone.h

remove extraneous svn:executable properties

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

gentone-ulaw.c

remove extraneous svn:executable properties

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

gentone.c

remove extraneous svn:executable properties

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

iax2-parser.c

remove extraneous svn:executable properties

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

iax2-parser.h

remove extraneous svn:executable properties

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

iax2-provision.c

remove extraneous svn:executable properties

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

iax2-provision.h

remove extraneous svn:executable properties

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

iax2.h

remove extraneous svn:executable properties

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

Makefile

automerge commit

2006-04-30 15:05:31 +00:00

ring10.h

remove extraneous svn:executable properties

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