543dc3caea
Conflicts: src/include/switch_core_media.h src/mod/endpoints/mod_sofia/sofia_media.c src/switch_core_media.c |
||
---|---|---|
.. | ||
FS-2746.diff | ||
MODAPP-293.diff | ||
mod_portaudio_snow_leopard.diff | ||
sofia.diff | ||
zrtp_bnlib_pic.diff |