sjero.net Git - linphone/commit

]> sjero.net Git - linphone/commit

author	Simon Morlat <simon.morlat@linphone.org>
	Thu, 26 Aug 2010 14:01:10 +0000 (16:01 +0200)
committer	Simon Morlat <simon.morlat@linphone.org>
	Thu, 26 Aug 2010 14:01:10 +0000 (16:01 +0200)
commit	d4a57fff796b21223747591ba2d22a8b61906660
tree	87fbb0d81fc7afd35b06c899cae0dfebc666d1fb	tree \| snapshot
parent	bc9405547d0ea9491f76c2d5aa413f90eebace85	commit \| diff
parent	f6d765bc22972a44e7a80f39d36a4efc2847df0a	commit \| diff

Merge branch 'dev_multicall'
and improve documentation

Conflicts:
coreapi/callbacks.c
coreapi/linphonecore.c
coreapi/linphonecore.h

coreapi/help/Doxyfile.in	diff1 \|	diff2 \|	blob \| history
coreapi/help/Makefile.am	diff1 \|	diff2 \|	blob \| history
coreapi/help/doxygen.dox.in	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecall.c	\|	diff2 \|	blob \| history
coreapi/linphonecore.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	diff1 \|	diff2 \|	blob \| history
coreapi/sal_eXosip2.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

RSS Atom

coreapi/help/Doxyfile.in	diff1 \|	diff2 \|	blob \| history
coreapi/help/Makefile.am	diff1 \|	diff2 \|	blob \| history
coreapi/help/doxygen.dox.in	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecall.c	\|	diff2 \|	blob \| history
coreapi/linphonecore.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	diff1 \|	diff2 \|	blob \| history
coreapi/sal_eXosip2.c	diff1 \|	diff2 \|	blob \| history
mediastreamer2	diff1 \|	diff2 \|	blob \| history