]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6566c11 92642e7)
Merge branch 'local_videoios' into dev_videoios
authorSimon Morlat <simon.morlat@linphone.org>
Fri, 28 Oct 2011 19:58:40 +0000 (21:58 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Fri, 28 Oct 2011 19:58:40 +0000 (21:58 +0200)

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