]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
Merge remote branch 'fsorig/master'
authorDavid Yat Sin <dyatsin@sangoma.com>
Mon, 18 Jul 2011 22:24:54 +0000 (18:24 -0400)
committerDavid Yat Sin <dyatsin@sangoma.com>
Mon, 18 Jul 2011 22:24:54 +0000 (18:24 -0400)
commitc3cbb3df885a29af1a111d59b3d1a74d059bf9fd
tree36d7f4c61dc6b39de11f953f2907debace85adb7
parent157a89adef83ace939ab44e156725dd785938274
parent6d03eb34f9f398684d353f8703da42794c992ac1
Merge remote branch 'fsorig/master'

Conflicts:
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
libs/freetdm/src/ftdm_io.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_trace.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c