]> sjero.net Git - linphone/commit
Merge branch 'master' into dev_multicall
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 21 May 2010 12:58:39 +0000 (14:58 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 21 May 2010 12:58:39 +0000 (14:58 +0200)
commitc501e09773f5b8dd623facd56c4332b0fc293434
tree5f1f8072a94a9ecef8db5af1cdf836ba27a92f26
parent1135f599f10a33ac7e1438129f1427eb51a483f0
parentb5497652f2f970174464bfd3e7dbde440d16b8a5
Merge branch 'master' into dev_multicall
coreapi/linphonecore.c
coreapi/linphonecore.h
coreapi/private.h
coreapi/sal.h
coreapi/sal_eXosip2.c
gtk-glade/incall_view.c
gtk-glade/main.c