Automerge script 38e8d3eb6a automerge commit ...

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

2008-06-03 19:35:40 +00:00

..

h323

automerge commit

2007-03-06 15:54:14 +00:00

misdn

automerge commit

2007-07-04 15:25:49 +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

2007-07-23 19:30:11 +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-08-30 19:03:07 +00:00

chan_h323.c

merge up to branch 1.2 and re-enable automerge

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

chan_iax2.c

automerge commit

2008-05-30 13:28:02 +00:00

chan_local.c

automerge commit

2007-07-05 14:26:28 +00:00

chan_mgcp.c

merge up to branch 1.2 and re-enable automerge

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

chan_misdn.c

automerge commit

2007-07-04 09:25:30 +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

2007-04-25 20:26:05 +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

2007-07-11 17:31:25 +00:00

chan_sip.c

automerge commit

2008-06-03 19:35:40 +00:00

chan_skinny.c

get branch up to date to include ASA fixes

2007-07-17 21:09:39 +00:00

chan_vpb.c

automerge commit

2006-08-05 06:04:09 +00:00

chan_zap.c

automerge commit

2007-08-07 18:44:16 +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

get branch up to date to include ASA fixes

2007-07-17 21:09:39 +00:00

iax2-parser.h

get branch up to date to include ASA fixes

2007-07-17 21:09:39 +00:00

iax2-provision.c

automerge commit

2006-09-28 18:01:52 +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

2007-07-11 17:31:25 +00:00

misdn_config.c

automerge commit

2007-06-05 12:17:36 +00:00

ring10.h

remove extraneous svn:executable properties

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