]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 209f768 b759177)
Merge branch 'master' of git.linphone.org:linphone-private
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Mon, 6 Dec 2010 13:29:11 +0000 (14:29 +0100)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Mon, 6 Dec 2010 13:29:11 +0000 (14:29 +0100)
1  2 
coreapi/linphonecore.h patch | diff1 | diff2 | blob | history
coreapi/linphonecore_jni.cc patch | diff1 | diff2 | blob | history

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