]> sjero.net Git - linphone/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 1 Apr 2011 10:57:36 +0000 (10:57 +0000)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 1 Apr 2011 10:57:36 +0000 (10:57 +0000)
commit65b0bebc6d3e530ad31820f75489e47eae5ae8a1
tree7759cc898ad2fa08fcc1079b0e65cd5c5896471a
parentfb1a35e37d662e76fefd61dc0a6416f778ee0817
parent693aa43ed57ad8d2972bb086066b19d1b1f4e4d2
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
mediastreamer2
coreapi/linphonecall.c