]> sjero.net Git - linphone/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 24 Nov 2010 21:38:48 +0000 (22:38 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 24 Nov 2010 21:38:48 +0000 (22:38 +0100)
commit81574fe90a3607578a50d664d6fc6296184151f1
tree9d29e5e7fbcccac3c3cc91dc0cfbcca5190e08a4
parentf55a93216d34d1ac7eb6bf5fdae35a71e2763564
parent3bf340a4b8f30d016ad3bff4737a9a3d3e954b1f
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
mediastreamer2