]> sjero.net Git - linphone/commit
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Mon, 24 Jan 2011 13:14:01 +0000 (14:14 +0100)
committerJehan Monnier <jehan.monnier@linphone.org>
Mon, 24 Jan 2011 13:14:01 +0000 (14:14 +0100)
commitb13ee295584407f18aea64d210c14858f2218796
tree2f3db403770636cb89ee5cfc0976d5dc2b9073fb
parentad43778a9c98b543889a400c8d434bc0cbce6199
parent703e455e34e4dc4d05dd0c5bf72166cee23a1dc1
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

Conflicts:
mediastreamer2