Moises Silva 2a00d3ea13 Merge remote branch 'fsorig/master' ...

Conflicts:
	conf/dialplan/default.xml

2010-11-30 12:19:42 -05:00

..

acl.conf.xml

…

alsa.conf.xml

…

callcenter.conf.xml

Fixed some windows compile warnings from merge

2010-11-19 14:33:57 -05:00

cdr_csv.conf.xml

…

cdr_pg_csv.conf.xml

…

cidlookup.conf.xml

…

conference.conf.xml

…

console.conf.xml

…

db.conf.xml

move limit.conf to db.conf

2010-06-19 07:49:34 -05:00

dialplan_directory.conf.xml

…

dingaling.conf.xml

…

directory.conf.xml

…

distributor.conf.xml

…

easyroute.conf.xml

…

enum.conf.xml

…

erlang_event.conf.xml

Fixed some windows compile warnings from merge

2010-11-19 14:33:57 -05:00

event_multicast.conf.xml

…

event_socket.conf.xml

…

fax.conf.xml

…

fifo.conf.xml

…

hash.conf.xml

mod_hash: oops, that meant to be commented out

2010-07-19 11:37:52 -04:00

ivr.conf.xml

…

java.conf.xml

mod_java: Allow user defined java methods to be called at startup and shutdown of JVM (MODLANG-117)

2010-05-31 10:15:35 -04:00

lcr.conf.xml

mod_lcr: update custom_sql syntax

2010-06-19 20:34:55 -05:00

local_stream.conf.xml

…

logfile.conf.xml

…

lua.conf.xml

…

memcache.conf.xml

…

modules.conf.xml

Fixed some windows compile warnings from merge

2010-11-19 14:33:57 -05:00

nibblebill.conf.xml

…

opal.conf.xml

…

osp.conf.xml

Changed OSP TCP port from 1080 to 5045.

2010-07-07 15:41:09 +08:00

perl.conf.xml

…

pocketsphinx.conf.xml

…

portaudio.conf.xml

default to 48k since most sound cards can do that

2010-06-04 11:50:17 -05:00

post_load_modules.conf.xml

…

python.conf.xml

…

redis.conf.xml

Add redis backend to limit

2010-06-22 00:16:50 -04:00

rss.conf.xml

…

sangoma_codec.conf.xml

mod_sangoma_codec: update sample config

2010-11-24 16:13:52 -05:00

shout.conf.xml

…

skinny.conf.xml

…

sofia.conf.xml

…

spandsp.conf.xml

mod_spandsp: add start_tone_detect/stop_tone_detect app and api commands for tone and cadence detection (MODAPP-378)

2010-05-31 08:41:07 -04:00

spidermonkey.conf.xml

…

switch.conf.xml

Fixed some windows compile warnings from merge

2010-11-19 14:33:57 -05:00

syslog.conf.xml

…

timezones.conf.xml

…

tts_commandline.conf.xml

…

unicall.conf.xml

…

unimrcp.conf.xml

…

voicemail.conf.xml

Fixed some windows compile warnings from merge

2010-11-19 14:33:57 -05:00

xml_cdr.conf.xml

…

xml_curl.conf.xml

…

xml_rpc.conf.xml

…

zeroconf.conf.xml

…