]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cbdabdf 531f9c8)
Merge commit '531f9c8'
authorJehan Monnier <jehan.monnier@linphone.org>
Mon, 28 Mar 2011 08:30:05 +0000 (10:30 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Mon, 28 Mar 2011 08:30:05 +0000 (10:30 +0200)
1  2 
coreapi/linphonecore.c patch | diff1 | diff2 | blob | history

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