]> sjero.net Git - linphone/commit
Merge remote-tracking branch 'origin/master' into dev_videoios
authorPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Tue, 16 Aug 2011 10:07:50 +0000 (12:07 +0200)
committerPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Tue, 16 Aug 2011 10:07:50 +0000 (12:07 +0200)
commita99ea3b16c818e5099c25311285417514de5e4ee
treec51e2089e013b2701c7235ee51fc831467f8fe98
parenta0557c19a535ef89dbd3cab679955b8ec79f42e0
parentf5f8a155701bc1c36483c2f1d4433d41a61bb396
Merge remote-tracking branch 'origin/master' into dev_videoios

Conflicts:
coreapi/linphonecall.c
coreapi/linphonecore.c
coreapi/proxy.c
coreapi/sal.c
coreapi/sal_eXosip2.c
coreapi/sal_eXosip2.h
java/common/org/linphone/core/LinphoneCall.java
mediastreamer2
coreapi/linphonecore.c
mediastreamer2