]> sjero.net Git - linphone/commit
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Mon, 1 Aug 2011 09:52:16 +0000 (11:52 +0200)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Mon, 1 Aug 2011 09:52:16 +0000 (11:52 +0200)
commitbfb27bb7cfc303bb3fbdaea3eea719c7eda2e4bb
treefd67e576fe2ca46cfe4ffa7c91d364523b3aa925
parenta2699e54294837654ac59de021a70372e6529c81
parent00d09892c7b60804a3f3cbcbe66d61a23d6f779c
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

Conflicts:
mediastreamer2
oRTP