sjero.net Git - linphone/commit

]> sjero.net Git - linphone/commit

author	Jehan Monnier <jehan.monnier@linphone.org>
	Mon, 14 Nov 2011 10:10:24 +0000 (11:10 +0100)
committer	Jehan Monnier <jehan.monnier@linphone.org>
	Mon, 14 Nov 2011 10:10:24 +0000 (11:10 +0100)
commit	e6c0ee2f7caad4912c48d02ace476efcbb8da0c0
tree	ae2acee9a0da3fdd611df73c069159066537b74f	tree \| snapshot
parent	23e177a1f349fe3ed83a43b5317b9662ede9276f	commit \| diff
parent	2ac5355a9b687dab8cce86e7f5671e2524a10d56	commit \| diff

Merge remote-tracking branch 'private/dev_videoios'

Conflicts:
mediastreamer2

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