]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db9c133 0b9b574)
Merge branch 'master' of git.linphone.org:linphone
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 22 Feb 2013 20:37:11 +0000 (21:37 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 22 Feb 2013 20:37:11 +0000 (21:37 +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