David Yat Sin 8b0fbe605c Merge branch 'releases.3.5' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3 ...

Conflicts:
	.gitignore
	conf/insideout/autoload_configs/modules.conf.xml
	conf/vanilla/autoload_configs/modules.conf.xml
	src/mod/endpoints/mod_sofia/mod_sofia.h
	src/switch_rtp.c

2012-07-25 11:15:18 -04:00

..

abstraction.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

acl.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

alsa.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

blacklist.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

callcenter.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

cdr_csv.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

cdr_mongodb.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

cdr_pg_csv.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

cdr_sqlite.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

cepstral.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

cidlookup.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

conference.conf.xml

FS-4088

2012-04-11 08:16:15 -05:00

console.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

db.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

dialplan_directory.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

dingaling.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

directory.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

distributor.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

easyroute.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

enum.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

erlang_event.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

event_multicast.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

event_socket.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

fax.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

fifo.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

hash.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

httapi.conf.xml

FS-4075

2012-04-05 11:18:18 -05:00

http_cache.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

ivr.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

java.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

lcr.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

local_stream.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

logfile.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

lua.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

memcache.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

modules.conf.xml

Merge branch 'releases.3.5' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3

2012-07-25 11:15:18 -04:00

mongo.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

nibblebill.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

opal.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

osp.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

perl.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

pocketsphinx.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

portaudio.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

post_load_modules.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

presence_map.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

python.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

redis.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

rss.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

rtmp.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

sangoma_codec.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

shout.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

skinny.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

sofia.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

spandsp.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

spidermonkey.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

switch.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

syslog.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

timezones.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

tts_commandline.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

unicall.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

unimrcp.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

voicemail_ivr.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

voicemail.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

xml_cdr.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

xml_curl.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

xml_rpc.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00

xml_scgi.conf.xml

add conf for mod_xml_scgi

2012-05-09 14:09:52 -05:00

zeroconf.conf.xml

conf: mv conf/* -> conf/vanilla/*

2012-03-24 03:19:32 +00:00