]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 907cd9a 857722d)
Merge branch 'master' into dev_sal
authorSimon Morlat <simon.morlat@linphone.org>
Thu, 28 Jan 2010 10:41:44 +0000 (11:41 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Thu, 28 Jan 2010 10:41:44 +0000 (11:41 +0100)
Conflicts:
po/ru.po


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