]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f6e745 fa1e465)
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Fri, 21 Jan 2011 15:16:54 +0000 (16:16 +0100)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Fri, 21 Jan 2011 15:16:54 +0000 (16:16 +0100)
Conflicts:
mediastreamer2


Trivial 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