git.ipfire.org Git - thirdparty/freeswitch.git/commit

]> git.ipfire.org Git - thirdparty/freeswitch.git/commit

projects / thirdparty / freeswitch.git / commit

author	David Yat Sin <dyatsin@sangoma.com>
	Thu, 26 Apr 2012 20:13:26 +0000 (16:13 -0400)
committer	David Yat Sin <dyatsin@sangoma.com>
	Thu, 26 Apr 2012 20:13:26 +0000 (16:13 -0400)
commit	5226489c3971b84c2ba0d1b5aa3e0ad581dcd229
tree	d61725e9a2c6ce057e3a64b56c5ce1e8d8cc9b39	tree
parent	e3369119e018a499c01f94bccbbbebe63907af4e	commit \| diff
parent	4f5a6557fce63fb739f734b87c50e09764f9cbef	commit \| diff

Merge branch 'releases.3.4' into releases.3.5

Conflicts:
libs/freetdm/mod_freetdm/mod_freetdm.c
libs/freetdm/src/ftdm_state.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c

Mirror of https://github.com/signalwire/freeswitch.git

RSS Atom

libs/freetdm/mod_freetdm/mod_freetdm.c	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftdm_io.c	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftdm_state.c	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c	diff1 \|	diff2 \|	blob \| history