Merge branch 'master' of git.linphone.org:linphone

This commit is contained in:
Yann Diorcet 2012-05-16 09:39:58 +02:00
commit 11c88ab6e0
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit 2413338721f9ac82249a47b333ccca53fb7d3359
Subproject commit f726584f2a708f2f8a0c9d1933018382364cbf15

2
oRTP

@ -1 +1 @@
Subproject commit 9d8e0cc62b8da06d596f4ed2b62e2c98dad990b3
Subproject commit ff0da4b42661d9996753372cb35dc0f25f5ff6ec