Russell Bryant 2b5e595403 Merged revisions 168481 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

................
r168481 | russell | 2009-01-12 08:57:49 -0600 (Mon, 12 Jan 2009) | 10 lines

Merged revisions 168480 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r168480 | russell | 2009-01-12 08:57:27 -0600 (Mon, 12 Jan 2009) | 2 lines

s/ringdance/ringcadence/ for Bulgaria

........

................


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

2009-01-12 14:58:53 +00:00

..

adsi.conf.sample

…

adtranvofr.conf.sample

…

agents.conf.sample

Merged revisions 149756 via svnmerge from

2008-10-15 20:22:00 +00:00

ais.conf.sample

Merge another big set of changes from team/russell/events

2008-06-10 15:12:17 +00:00

alarmreceiver.conf.sample

…

alsa.conf.sample

…

amd.conf.sample

…

asterisk.adsi

…

cdr_adaptive_odbc.conf.sample

…

cdr_custom.conf.sample

…

cdr_manager.conf.sample

…

cdr_odbc.conf.sample

…

cdr_pgsql.conf.sample

…

cdr_sqlite3_custom.conf.sample

…

cdr_tds.conf.sample

Merged revisions 138442 via svnmerge from

2008-08-16 16:42:43 +00:00

cdr.conf.sample

…

chan_dahdi.conf.sample

Merged revisions 155671 via svnmerge from

2008-11-09 16:32:49 +00:00

cli.conf.sample

…

codecs.conf.sample

…

console.conf.sample

…

dbsep.conf.sample

…

dnsmgr.conf.sample

…

dsp.conf.sample

…

dundi.conf.sample

Update dundi.conf to indicate that the asterisk.conf entityid option can be used

2008-06-10 12:50:07 +00:00

enum.conf.sample

…

extconfig.conf.sample

…

extensions_minivm.conf.sample

…

extensions.ael.sample

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-12 17:27:55 +00:00

extensions.conf.sample

Merged revisions 152765 via svnmerge from

2008-10-30 04:29:07 +00:00

extensions.lua.sample

Merged revisions 144523 via svnmerge from

2008-09-25 21:25:00 +00:00

features.conf.sample

Merged revisions 152605 via svnmerge from

2008-10-29 05:52:41 +00:00

festival.conf.sample

…

followme.conf.sample

…

func_odbc.conf.sample

…

gtalk.conf.sample

Update configuration files to add missing options for jingle, gtalk,

2008-07-21 21:12:51 +00:00

h323.conf.sample

…

http.conf.sample

Update sample configuration to match what are now the defaults for the prefix.

2008-06-26 01:11:43 +00:00

iax.conf.sample

Merge changes from team/bbryant/keyrotation

2008-08-01 18:16:24 +00:00

iaxprov.conf.sample

…

indications.conf.sample

Merged revisions 168481 via svnmerge from

2009-01-12 14:58:53 +00:00

jabber.conf.sample

Minor text fix. roster -> resource.

2008-05-22 15:49:17 +00:00

jingle.conf.sample

Update configuration files to add missing options for jingle, gtalk,

2008-07-21 21:12:51 +00:00

logger.conf.sample

…

manager.conf.sample

Update configuration files to add missing options for jingle, gtalk,

2008-07-21 21:12:51 +00:00

meetme.conf.sample

Revert my change to the sample meetme conf file as it was incorrect.

2008-06-22 17:36:20 +00:00

mgcp.conf.sample

…

minivm.conf.sample

…

misdn.conf.sample

Merged revisions 136241 via svnmerge from

2008-08-07 19:01:03 +00:00

modules.conf.sample

Note that only one timing interface should get loaded.

2008-06-16 13:31:36 +00:00

musiconhold.conf.sample

…

muted.conf.sample

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-12 17:27:55 +00:00

osp.conf.sample

…

oss.conf.sample

fix example configuration for video support in chan_oss

2008-05-19 14:54:34 +00:00

phone.conf.sample

…

phoneprov.conf.sample

…

queuerules.conf.sample

…

queues.conf.sample

Merged revisions 167477 via svnmerge from

2009-01-07 18:27:35 +00:00

res_config_sqlite.conf

…

res_ldap.conf.sample

Merged revisions 148120 via svnmerge from

2008-10-09 23:27:21 +00:00

res_odbc.conf.sample

…

res_pgsql.conf.sample

Merge the adaptive realtime branch, which will make adding new required fields

2008-06-05 19:07:27 +00:00

res_snmp.conf.sample

…

rpt.conf.sample

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-12 17:27:55 +00:00

rtp.conf.sample

Merged revisions 144829 via svnmerge from

2008-09-26 23:16:42 +00:00

say.conf.sample

…

sip_notify.conf.sample

Merged revisions 146312 via svnmerge from

2008-10-04 01:57:45 +00:00

sip.conf.sample

Merged revisions 142866 via svnmerge from

2008-09-12 20:52:10 +00:00

skinny.conf.sample

Move implementation of an attended-transfer-complete sound from one channel

2008-07-30 16:40:43 +00:00

sla.conf.sample

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-12 17:27:55 +00:00

smdi.conf.sample

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-12 17:27:55 +00:00

telcordia-1.adsi

…

udptl.conf.sample

…

unistim.conf.sample

…

usbradio.conf.sample

…

users.conf.sample

Allow alternative extensions to be specified for a user.

2008-06-19 19:22:59 +00:00

voicemail.conf.sample

Merged revisions 163213 via svnmerge from

2008-12-11 21:00:25 +00:00

vpb.conf.sample

Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

2008-06-12 17:27:55 +00:00