]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0740271 7f27de5)
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Wed, 30 Mar 2011 13:17:29 +0000 (15:17 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Wed, 30 Mar 2011 13:17:29 +0000 (15:17 +0200)
1  2 
coreapi/linphonecore.c patch | diff1 | diff2 | blob | history
coreapi/linphonecore.h patch | diff1 | diff2 | blob | history

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