]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cd00986 a61a62b)
Merge branch 'master' of git.linphone.org:linphone-private
authorJehan Monnier <jehan.monnier@linphone.org>
Fri, 18 Jun 2010 09:00:23 +0000 (11:00 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Fri, 18 Jun 2010 09:00:23 +0000 (11:00 +0200)
Conflicts:
mediastreamer2

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