-
Simon Morlat authored
Conflicts: console/commands.c coreapi/callbacks.c coreapi/linphonecore.c coreapi/sal_eXosip2.c mediastreamer2
f521b69f
Conflicts: console/commands.c coreapi/callbacks.c coreapi/linphonecore.c coreapi/sal_eXosip2.c mediastreamer2