]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
Merged latest FreeTDM code from Sangoma's repo
authorDavid Yat Sin <dyatsin@sangoma.com>
Wed, 12 Sep 2012 15:05:39 +0000 (11:05 -0400)
committerDavid Yat Sin <dyatsin@sangoma.com>
Wed, 12 Sep 2012 15:05:39 +0000 (11:05 -0400)
commit4340c4d74c240dd9ee6ddca249f9c25227d7f9db
treecc5cc49992ca2ba8d7281ea1341df6a265a31b95
parent8f0c726b136aa5518c4b52e76107031fec5a8756
parentc425955670c0b11018056f2d8614b37e8766567a
Merged latest FreeTDM code from Sangoma's repo
Merge remote branch 'smgfs/master'

Conflicts:
build/modules.conf.in
configure.in
libs/esl/fs_cli.c
libs/freetdm/mod_freetdm/mod_freetdm.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_logger.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
src/include/switch_types.h
src/mod/applications/mod_commands/mod_commands.c
src/mod/applications/mod_spandsp/mod_spandsp.c
src/mod/endpoints/mod_opal/mod_opal.cpp
src/mod/endpoints/mod_opal/mod_opal.h
src/mod/endpoints/mod_sofia/mod_sofia.h
src/mod/endpoints/mod_sofia/rtp.c
src/switch.c
src/switch_core.c
src/switch_rtp.c
12 files changed:
libs/freetdm/Makefile.am
libs/freetdm/mod_freetdm/mod_freetdm.c
libs/freetdm/src/ftdm_io.c
libs/freetdm/src/ftdm_state.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_cfg.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
libs/freetdm/src/include/freetdm.h
libs/freetdm/src/include/private/ftdm_core.h