sjero.net Git - linphone/commit

]> sjero.net Git - linphone/commit

author	Simon Morlat <simon.morlat@linphone.org>
	Wed, 2 Jun 2010 12:35:25 +0000 (14:35 +0200)
committer	Simon Morlat <simon.morlat@linphone.org>
	Wed, 2 Jun 2010 12:35:25 +0000 (14:35 +0200)
commit	2d6667238ec9f1194a9ec15c3b29dea4d0d1fd7a
tree	52d63ead3b54cf2bd53558f936aa6ce53225d599	tree \| snapshot
parent	f6537cb2b541f3904a1988bf781d399b6bf3e8a2	commit \| diff
parent	4fed6f59484644d13b9e421084c4bf54b013a1c2	commit \| diff

Merge branch 'master' into dev_multicall

Conflicts:
coreapi/callbacks.c
coreapi/sal_eXosip2.c
mediastreamer2

coreapi/callbacks.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	diff1 \|	diff2 \|	blob \| history
coreapi/sal_eXosip2.c	diff1 \|	diff2 \|	blob \| history
gtk-glade/incall_view.c	diff1 \|	diff2 \|	blob \| history
gtk-glade/main.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

coreapi/callbacks.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	diff1 \|	diff2 \|	blob \| history
coreapi/sal_eXosip2.c	diff1 \|	diff2 \|	blob \| history
gtk-glade/incall_view.c	diff1 \|	diff2 \|	blob \| history
gtk-glade/main.c	diff1 \|	diff2 \|	blob \| history