]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b69c66 3981cdd)
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Tue, 24 May 2011 13:56:24 +0000 (15:56 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Tue, 24 May 2011 13:56:24 +0000 (15:56 +0200)
Conflicts:
mediastreamer2

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