]> sjero.net Git - linphone/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Thu, 7 Apr 2011 15:37:16 +0000 (17:37 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Thu, 7 Apr 2011 15:37:16 +0000 (17:37 +0200)
commit5a345d5ecf81871f40a936fe2e7ec87dc58e7a8e
tree11d784245729d9cac2fc8186dfc25856caad1732
parentcfadd8a082a4a4c7cb07d02ca5865a3006d6b4a1
parent50bf22bd7c882578f2a2ffcbf0f2677762ba647a
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
mediastreamer2