]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f28e796 5139b55)
Merge branch 'master' of git.linphone.org:linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Wed, 29 Aug 2012 17:22:29 +0000 (19:22 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Wed, 29 Aug 2012 17:22:29 +0000 (19:22 +0200)
1  2 
coreapi/sal_eXosip2.c patch | diff1 | diff2 | blob | history

diff --cc coreapi/sal_eXosip2.c
Simple merge
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