543dc3caea
Conflicts: src/include/switch_core_media.h src/mod/endpoints/mod_sofia/sofia_media.c src/switch_core_media.c |
||
---|---|---|
.. | ||
src | ||
Makefile |
543dc3caea
Conflicts: src/include/switch_core_media.h src/mod/endpoints/mod_sofia/sofia_media.c src/switch_core_media.c |
||
---|---|---|
.. | ||
src | ||
Makefile |