]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 881f602 180a835)
Merge branch 'dev_sal' of belledonne-communications.com:linphone-private into dev_sal
authorJehan Monnier <jehan.monnier@linphone.org>
Tue, 16 Mar 2010 16:46:35 +0000 (17:46 +0100)
committerJehan Monnier <jehan.monnier@linphone.org>
Tue, 16 Mar 2010 16:46:35 +0000 (17:46 +0100)
1  2 
coreapi/private.h patch | diff1 | diff2 | blob | history

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