]> sjero.net Git - linphone/commit
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 7 Oct 2011 14:33:13 +0000 (16:33 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 7 Oct 2011 14:33:13 +0000 (16:33 +0200)
commit12bf9694a4b506c3145adfd2aaf90c49d72e3369
treeb062a133555850df94c5c9af07efc2277ac8bbb0
parent93cebd8f63b405e93a24d9fd45d15478ee188010
parent0109d8680d1dd3985d03854ee1a9670b355a7ba3
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
coreapi/linphonecall.c
coreapi/linphonecall.c