kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'nsg-4.3' of git.sangoma.com:smg_freeswitch into nsg-4.3

This commit is contained in:
Mathieu Rene 2012-06-22 19:10:41 -04:00
parent fd634d6bc9 adca0985a4
commit fa616a377b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/modules.conf.in
View File

@ -8,10 +8,10 @@ applications/mod_spandsp
#applications/mod_rad_auth #applications/mod_rad_auth
dialplans/mod_dialplan_xml dialplans/mod_dialplan_xml
endpoints/mod_sofia endpoints/mod_sofia
endpoints/mod_media_gateway #endpoints/mod_media_gateway
../../libs/freetdm/mod_freetdm ../../libs/freetdm/mod_freetdm
xml_int/mod_xml_cdr xml_int/mod_xml_cdr
event_handlers/mod_event_socket event_handlers/mod_event_socket
codecs/mod_sangoma_codec codecs/mod_sangoma_codec
event_handlers/mod_radius_cdr #event_handlers/mod_radius_cdr

2
conf/insideout/autoload_configs/modules.conf.xml
View File

@ -60,7 +60,7 @@
<load module="mod_g723_1"/> <load module="mod_g723_1"/>
<load module="mod_g729"/> <load module="mod_g729"/>
<load module="mod_amr"/> <load module="mod_amr"/>
<load module="mod_ilbc"/> <!-- <load module="mod_ilbc"/> -->
<load module="mod_speex"/> <load module="mod_speex"/>
<load module="mod_h26x"/> <load module="mod_h26x"/>
<!--<load module="mod_siren"/>--> <!--<load module="mod_siren"/>-->

2
conf/vanilla/autoload_configs/modules.conf.xml
View File

@ -80,7 +80,7 @@
<load module="mod_g723_1"/> <load module="mod_g723_1"/>
<load module="mod_g729"/> <load module="mod_g729"/>
<load module="mod_amr"/> <load module="mod_amr"/>
<load module="mod_ilbc"/> <!-- <load module="mod_ilbc"/> -->
<load module="mod_speex"/> <load module="mod_speex"/>
<load module="mod_h26x"/> <load module="mod_h26x"/>
<load module="mod_siren"/> <load module="mod_siren"/>