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

Conflicts:
	console/Makefile.am
	mediastreamer2
This commit is contained in:
Simon Morlat 2011-01-31 15:54:16 +01:00
commit a532eb55bd
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit 664e9338cf0f963ef6ab6caad9679abcdfeb60c9
Subproject commit 021159970deaa9f1ec9a3a912c4b2fb48400f044

2
oRTP

@ -1 +1 @@
Subproject commit 37c60a638fd108404ca437e2bbef78f227178450
Subproject commit c8b487f32fe225f8b1961754db9140eb282a0d28