sjero.net Git - linphone/commit

]> sjero.net Git - linphone/commit

author	Simon Morlat <simon.morlat@linphone.org>
	Thu, 17 Jun 2010 10:35:47 +0000 (12:35 +0200)
committer	Simon Morlat <simon.morlat@linphone.org>
	Thu, 17 Jun 2010 10:35:47 +0000 (12:35 +0200)
commit	722ab2d99d85b5dfd4bae6eda1a48bb36cac8a34
tree	a73d193f93a92841bd825d4502a9798f2ee13479	tree \| snapshot
parent	7a8eea66e0ee7f68058ffd4a5c626b9b1f70a17a	commit \| diff
parent	a61a62b090b759a0854e602bdf589072a5a9fc6a	commit \| diff

Merge branch 'master' into dev_multicall

Conflicts:
console/commands.c
coreapi/linphonecore.c
coreapi/linphonecore.h

console/commands.c	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
coreapi/sal.h	diff1 \|	diff2 \|	blob \| history
coreapi/sal_eXosip2.c	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

console/commands.c	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
coreapi/sal.h	diff1 \|	diff2 \|	blob \| history
coreapi/sal_eXosip2.c	diff1 \|	diff2 \|	blob \| history