Automerge Script 48e2d876ff automerge commit ...

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

2007-04-03 10:38:41 +00:00

..

h323

automerge commit

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

misdn

automerge commit

2007-04-03 10:38:41 +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-02-28 19:22: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-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

2007-03-29 18:54:38 +00:00

chan_local.c

automerge commit

2007-03-01 23:07:54 +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-04-02 12:38:35 +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-08-05 06:04:09 +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

manual update, since automerge is not running at this time

2006-12-12 22:58:49 +00:00

chan_sip.c

automerge commit

2007-03-29 17:04:00 +00:00

chan_skinny.c

merge up to branch 1.2 and re-enable automerge

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

chan_vpb.c

automerge commit

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

chan_zap.c

automerge commit

2007-02-14 17:23:39 +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

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-03-29 17:04:00 +00:00

misdn_config.c

automerge commit

2007-04-03 10:38:41 +00:00

ring10.h

remove extraneous svn:executable properties

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