]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0557c1 f5f8a15)
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)
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

1  2 
coreapi/linphonecore.c patch | diff1 | diff2 | blob | history
mediastreamer2 patch | diff1 | diff2 | blob | history

diff --cc coreapi/linphonecore.c
Simple merge
diff --cc mediastreamer2
index 187a2132cebc630086384bfa8c7a9a50b260cbaf,548c7012382db6442a2ec75f4d9ff8f67c853244..e297622976e5dcae7ec9de1233178149d30b42ad
--- 1/mediastreamer2
--- 2/mediastreamer2
+++ b/mediastreamer2
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 187a2132cebc630086384bfa8c7a9a50b260cbaf
 -Subproject commit 548c7012382db6442a2ec75f4d9ff8f67c853244
++Subproject commit e297622976e5dcae7ec9de1233178149d30b42ad
Linphone VOIP client (https://www.linphone.org/) with ongoing modifications to enable DCCP support for the Masters Thesis of Samuel Jero <sj323707@ohio.edu>. Clone using: git clone http://sjero.net/src/linphone/ linphone