Automerge Script b7765f3783 automerge commit ...

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

2007-02-16 23:21:15 +00:00

..

adsi.conf.sample

remove extraneous svn:executable properties

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

adtranvofr.conf.sample

remove extraneous svn:executable properties

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

agents.conf.sample

remove extraneous svn:executable properties

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

alarmreceiver.conf.sample

remove extraneous svn:executable properties

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

alsa.conf.sample

automerge commit

2006-09-11 17:02:51 +00:00

asterisk.adsi

remove extraneous svn:executable properties

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

cdr_custom.conf.sample

remove extraneous svn:executable properties

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

cdr_manager.conf.sample

remove extraneous svn:executable properties

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

cdr_odbc.conf.sample

remove extraneous svn:executable properties

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

cdr_pgsql.conf.sample

remove extraneous svn:executable properties

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

cdr_tds.conf.sample

remove extraneous svn:executable properties

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

cdr.conf.sample

automerge commit

2006-09-11 17:02:51 +00:00

codecs.conf.sample

remove extraneous svn:executable properties

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

dnsmgr.conf.sample

merge up to branch 1.2 and re-enable automerge

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

dundi.conf.sample

automerge commit

2006-09-11 17:02:51 +00:00

enum.conf.sample

automerge commit

2006-09-11 17:02:51 +00:00

extconfig.conf.sample

remove extraneous svn:executable properties

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

extensions.ael.sample

remove extraneous svn:executable properties

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

extensions.conf.sample

manual update, since automerge is not running at this time

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

features.conf.sample

automerge commit

2006-09-11 17:02:51 +00:00

festival.conf.sample

remove extraneous svn:executable properties

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

iax.conf.sample

manual update, since automerge is not running at this time

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

iaxprov.conf.sample

remove extraneous svn:executable properties

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

indications.conf.sample

automerge commit

2006-09-18 16:02:39 +00:00

logger.conf.sample

remove extraneous svn:executable properties

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

manager.conf.sample

remove extraneous svn:executable properties

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

meetme.conf.sample

automerge commit

2007-02-16 23:21:15 +00:00

mgcp.conf.sample

automerge commit

2006-04-28 17:05:06 +00:00

misdn.conf.sample

automerge commit

2007-01-02 10:59:16 +00:00

modem.conf.sample

remove extraneous svn:executable properties

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

modules.conf.sample

remove extraneous svn:executable properties

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

musiconhold.conf.sample

remove extraneous svn:executable properties

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

osp.conf.sample

automerge commit

2006-09-11 17:02:51 +00:00

oss.conf.sample

remove extraneous svn:executable properties

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

phone.conf.sample

automerge commit

2006-09-11 17:02:51 +00:00

privacy.conf.sample

remove extraneous svn:executable properties

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

queues.conf.sample

automerge commit

2006-10-01 16:01:57 +00:00

res_odbc.conf.sample

Documenting two keywords that were previously missing

2005-12-08 23:32:08 +00:00

rpt.conf.sample

remove extraneous svn:executable properties

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

rtp.conf.sample

remove extraneous svn:executable properties

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

sip_notify.conf.sample

remove extraneous svn:executable properties

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

sip.conf.sample

manual update, since automerge is not running at this time

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

skinny.conf.sample

automerge commit

2006-09-11 17:02:51 +00:00

telcordia-1.adsi

remove extraneous svn:executable properties

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

voicemail.conf.sample

automerge commit

2006-09-11 17:02:51 +00:00

vpb.conf.sample

automerge commit

2006-09-11 17:02:51 +00:00

zapata.conf.sample

automerge commit

2006-09-18 16:02:39 +00:00