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

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

Merge remote-tracking branch 'moystash/em-suspend-support'

Conflicts:
libs/freetdm/src/include/private/ftdm_core.h

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

libs/freetdm/mod_freetdm/mod_freetdm.c	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftdm_io.c	diff1 \|	diff2 \|	blob \| history
libs/freetdm/src/ftmod/ftmod_analog/ftdm_analog.h	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