]> sjero.net Git - linphone/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 11 Feb 2011 07:56:35 +0000 (08:56 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 11 Feb 2011 07:56:35 +0000 (08:56 +0100)
commit4967b614549a4aebbe08d1d2b24e32d8d1d2a9e3
tree5afe2226320df5abaf8d5fc8045ab0fe4594df30
parent603b6fa944e5d9f177cff9c7b6c3c44a5eee85df
parent7818dee64bbdcb448d213d1bada84072488d4d4e
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
mediastreamer2