]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
Merge remote branch 'fsorig/master' into nfas
authorDavid Yat Sin <dyatsin@sangoma.com>
Tue, 4 Sep 2012 02:34:13 +0000 (22:34 -0400)
committerDavid Yat Sin <dyatsin@sangoma.com>
Tue, 4 Sep 2012 02:34:13 +0000 (22:34 -0400)
commit3a57b0bed612038f6e3b54e0002548245cefeefd
tree453902c132b11dbfbcbb75c2a18cec7890971268
parentb0f6e0384d8e109b364cb714861d198bf697842d
parent12b5bde226246d23d79279027ffd6e31e55ab12b
Merge remote branch 'fsorig/master' into nfas

Conflicts:
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
libs/freetdm/mod_freetdm/mod_freetdm.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_cfg.c
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
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_out.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c