Sandrine Avakian 710c416e0a Merge commit '77913a3c5e3aace6ab48b78383c011d50c6bec3c' into dev_loc ... # Conflicts: # coreapi/bellesip_sal/sal_op_call.c # coreapi/callbacks.c # mediastreamer2 # oRTP		2017-04-04 14:50:10 +02:00
..
sal.h	Merge commit '77913a3c5e3aace6ab48b78383c011d50c6bec3c' into dev_loc	2017-04-04 14:50:10 +02:00