sjero.net Git - linphone/commit

]> sjero.net Git - linphone/commit

author	Jehan Monnier <jehan.monnier@linphone.org>
	Wed, 21 Sep 2011 06:28:17 +0000 (08:28 +0200)
committer	Jehan Monnier <jehan.monnier@linphone.org>
	Wed, 21 Sep 2011 06:28:17 +0000 (08:28 +0200)
commit	191084508f03345f817156c856f692c547766960
tree	1e4533bc111e8b158b53f0823e73726412f31645	tree \| snapshot
parent	c51752fe70f7dd4e892ba87d00284095edda33e2	commit \| diff
parent	51ee80ec2b0ce934e44c73ad4931ca98a6798fa8	commit \| diff

Merge remote-tracking branch 'origin/master' into dev_videoios

Conflicts:
mediastreamer2

configure.ac	diff1 \|	diff2 \|	blob \| history
coreapi/Makefile.am	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	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

RSS Atom

configure.ac	diff1 \|	diff2 \|	blob \| history
coreapi/Makefile.am	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	diff1 \|	diff2 \|	blob \| history
mediastreamer2	diff1 \|	diff2 \|	blob \| history