]> sjero.net Git - linphone/commit
Fix merge
authorPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Tue, 16 Aug 2011 11:10:54 +0000 (13:10 +0200)
committerPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Tue, 16 Aug 2011 11:10:54 +0000 (13:10 +0200)
commitbe6d716e51eea255a95b842f1c5343c46cef4d9d
treeaed35aa623f6c99cf82b9fe433a14b75ebfa9036
parenta99ea3b16c818e5099c25311285417514de5e4ee
Fix merge
mediastreamer2