]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
Merge branch 'releases.3.5' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3
authorDavid Yat Sin <dyatsin@sangoma.com>
Wed, 25 Jul 2012 15:15:18 +0000 (11:15 -0400)
committerDavid Yat Sin <dyatsin@sangoma.com>
Wed, 25 Jul 2012 15:15:18 +0000 (11:15 -0400)
commit8b0fbe605c35c2c1e8f1afd4962fe9cce008bc5c
tree118cd572d570ac0d51315c302ac72e6c93a051c2
parentdd0b5147410de6915ecfc108d8b694dbc39dfcc0
parenteb0404d0256dee4696b3ae1b62c4b1cef9327a0d
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
conf/vanilla/autoload_configs/modules.conf.xml
libs/freetdm/Makefile.am
libs/freetdm/mod_freetdm/mod_freetdm.c
libs/freetdm/src/ftdm_io.c
libs/freetdm/src/include/freetdm.h
libs/freetdm/src/include/private/ftdm_types.h
src/include/switch_apr.h
src/include/switch_types.h
src/mod/endpoints/mod_sofia/mod_sofia.c
src/mod/endpoints/mod_sofia/mod_sofia.h
src/switch_rtp.c