]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9040037 2cb7be8)
Merge branch 'master' of belledonne-communications.com:linphone-private
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 19 May 2010 12:47:00 +0000 (14:47 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 19 May 2010 12:47:00 +0000 (14:47 +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