]> sjero.net Git - linphone/commit
Merge branch 'master' of git.linphone.org:linphone
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 22 Feb 2013 20:37:11 +0000 (21:37 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 22 Feb 2013 20:37:11 +0000 (21:37 +0100)
commit468a1b69d4871a598a4d55dbed4fa8909ccc3d08
tree61fb7333cd4db5dd3cfd876ee4f8d8b3b1270709
parentdb9c1335eb22f9816babac27c72d86efff581346
parent0b9b574db7fc4fe06b028a6d79ffdb902826dc04
Merge branch 'master' of git.linphone.org:linphone

Conflicts:
mediastreamer2