ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 13:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v1.4.beta

Browse Source
This commit is contained in:
Ken Rice
2013-09-17 09:43:34 -05:00
parent a263306400 dffe48aaec
commit 3c77ff817f
61 changed files with 621 additions and 900 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/modules.conf.in
+1 -2
View File
@@ -82,7 +82,6 @@ dialplans/mod_dialplan_xml
#endpoints/mod_dingaling
#endpoints/mod_gsmopen
#endpoints/mod_h323
#endpoints/mod_html5
#endpoints/mod_khomp
endpoints/mod_loopback
#endpoints/mod_opal
@@ -152,4 +151,4 @@ xml_int/mod_xml_scgi
#../../libs/openzap/mod_openzap
## Experimental Modules (don't cry if they're broken)
#../../contrib/mod/xml_int/mod_xml_odbc
#../../contrib/mod/xml_int/mod_xml_odbc