sjero.net Git - linphone/commit

]> sjero.net Git - linphone/commit

author	Simon Morlat <simon.morlat@linphone.org>
	Mon, 9 Aug 2010 07:55:45 +0000 (09:55 +0200)
committer	Simon Morlat <simon.morlat@linphone.org>
	Mon, 9 Aug 2010 07:55:45 +0000 (09:55 +0200)
commit	f521b69f42592c2f4dde6195bb03944690ff4705
tree	31cac8308ec2f86ed1d8ccfb226d441b85615d33	tree \| snapshot
parent	e6e6f38e0a512d2d47b9ccc7772902af2302a4ac	commit \| diff
parent	2cf2a5b104a2cd81b434f44f309cfe7c00c435f6	commit \| diff

Merge branch 'master' into dev_multicall

Conflicts:
console/commands.c
coreapi/callbacks.c
coreapi/linphonecore.c
coreapi/sal_eXosip2.c
mediastreamer2

console/commands.c	diff1 \|	diff2 \|	blob \| history
coreapi/callbacks.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	diff1 \|	diff2 \|	blob \| history
coreapi/proxy.c	diff1 \|	diff2 \|	blob \| history
coreapi/sal_eXosip2.c	diff1 \|	diff2 \|	blob \| history
mediastreamer2	blob1 \|	blob2 \|	history
pixmaps/Makefile.am	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/callbacks.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	diff1 \|	diff2 \|	blob \| history
coreapi/proxy.c	diff1 \|	diff2 \|	blob \| history
coreapi/sal_eXosip2.c	diff1 \|	diff2 \|	blob \| history
mediastreamer2	blob1 \|	blob2 \|	history
pixmaps/Makefile.am	diff1 \|	diff2 \|	blob \| history