Commit a532eb55 authored by Simon Morlat's avatar Simon Morlat

Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
	console/Makefile.am
	mediastreamer2
parents 28903fc8 aba5cc51
mediastreamer2 @ 02115997
Subproject commit 664e9338cf0f963ef6ab6caad9679abcdfeb60c9
Subproject commit 021159970deaa9f1ec9a3a912c4b2fb48400f044
oRTP @ c8b487f3
Subproject commit 37c60a638fd108404ca437e2bbef78f227178450
Subproject commit c8b487f32fe225f8b1961754db9140eb282a0d28
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment