]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
Merge remote branch 'fsorig/master' into releases.3.5
authorDavid Yat Sin <dyatsin@sangoma.com>
Thu, 31 May 2012 17:57:42 +0000 (13:57 -0400)
committerDavid Yat Sin <dyatsin@sangoma.com>
Thu, 31 May 2012 17:57:42 +0000 (13:57 -0400)
commiteb0404d0256dee4696b3ae1b62c4b1cef9327a0d
tree2c4adc93f347f88886aa177614e2b74c627c49ba
parentd56aebcc13606e053f4c19bb64cf064ce2f59343
parent24f6c4056b1bfec94020eeb9611b3fcb0f4f72b4
Merge remote branch 'fsorig/master' into releases.3.5

Conflicts:
build/modules.conf.in
libs/freetdm/mod_freetdm/mod_freetdm.c
17 files changed:
libs/esl/fs_cli.c
libs/freetdm/mod_freetdm/mod_freetdm.c
libs/freetdm/src/ftdm_io.c
libs/freetdm/src/ftdm_state.c
libs/freetdm/src/include/freetdm.h
libs/freetdm/src/include/private/ftdm_types.h
src/include/switch_apr.h
src/mod/applications/mod_commands/mod_commands.c
src/mod/applications/mod_spandsp/mod_spandsp.c
src/mod/endpoints/mod_sofia/mod_sofia.c
src/mod/endpoints/mod_sofia/mod_sofia.h
src/switch.c
src/switch_apr.c
src/switch_console.c
src/switch_core.c
src/switch_core_session.c
src/switch_loadable_module.c