]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 486492c 8712757)
Merge branch 'master' of git.linphone.org:linphone
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 14 Nov 2012 13:03:38 +0000 (14:03 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 14 Nov 2012 13:03:38 +0000 (14:03 +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