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>
	Tue, 3 Apr 2012 22:08:49 +0000 (18:08 -0400)
committer	David Yat Sin <dyatsin@sangoma.com>
	Tue, 3 Apr 2012 22:08:49 +0000 (18:08 -0400)
commit	27e4cdb4dd28c11126bf384f64e1f298bfe53de2
tree	08de07e6a8bd0b46a30dc04bb673054b96219ac0	tree
parent	1ad0bc250c7ba42d70481f73b843df8bf5bebb2f	commit \| diff
parent	66d90d5dfc9330f6f6b8d088240663f2ec00867a	commit \| diff

Merge branch 'fsorig'

Conflicts:
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.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/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cfg.c	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/include/freetdm.h	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/include/private/ftdm_core.h	diff1 \|	diff2 \|	blob \| history
src/mod/endpoints/mod_sofia/mod_sofia.c	diff1 \|	diff2 \|	blob \| history