]> sjero.net Git - linphone/commit
projects / linphone / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bd7e176 1caf08c)
Merge remote-tracking branch 'origin/master' into dev_videoios
authorJehan Monnier <jehan.monnier@linphone.org>
Wed, 14 Sep 2011 14:16:44 +0000 (16:16 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Wed, 14 Sep 2011 14:16:44 +0000 (16:16 +0200)
commit406c3a1019964463a0565488f7bf746fc8bab360
tree9c06fb28ee963f17a5a7696c35f9cc44e4e2b599tree | snapshot
parentbd7e176640234d606fd4d02ad4f8c99597c940cdcommit | diff
parent1caf08c5962640fdde3d26eb40504bf367786895commit | diff
Merge remote-tracking branch 'origin/master' into dev_videoios

Conflicts:
coreapi/Makefile.am
coreapi/linphonecore.c
mediastreamer2
configure.ac diff1 | diff2 | blob | history
coreapi/Makefile.am diff1 | diff2 | blob | history
coreapi/help/Makefile.am diff1 | diff2 | blob | history
coreapi/linphonecore.c diff1 | diff2 | blob | history
mediastreamer2 diff1 | diff2 | blob | history
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