]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0025ff0 e91cae1)
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorGuillaume Beraudo <guillaume.beraudo@linphone.org>
Wed, 6 Apr 2011 13:15:22 +0000 (15:15 +0200)
committerGuillaume Beraudo <guillaume.beraudo@linphone.org>
Wed, 6 Apr 2011 13:15:22 +0000 (15:15 +0200)
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