]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'releases.3.4.experimental_head' into releases.3.5
authorMoises Silva <moy@sangoma.com>
Tue, 31 Jan 2012 22:17:25 +0000 (17:17 -0500)
committerMoises Silva <moy@sangoma.com>
Tue, 31 Jan 2012 22:17:25 +0000 (17:17 -0500)
1  2 
libs/freetdm/mod_freetdm/mod_freetdm.c
libs/freetdm/src/ftdm_io.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
libs/freetdm/src/include/freetdm.h
libs/freetdm/src/include/private/ftdm_core.h
src/switch.c

Simple merge
Simple merge
diff --cc src/switch.c
Simple merge