]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 347b308 f92683d)
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 15 Oct 2010 12:53:50 +0000 (14:53 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 15 Oct 2010 12:53:50 +0000 (14:53 +0200)
1  2 
coreapi/friend.c patch | diff1 | diff2 | blob | history

diff --cc coreapi/friend.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