sjero.net Git - linphone/commit

]> sjero.net Git - linphone/commit

author	Simon Morlat <simon.morlat@linphone.org>
	Mon, 15 Mar 2010 14:10:42 +0000 (15:10 +0100)
committer	Simon Morlat <simon.morlat@linphone.org>
	Mon, 15 Mar 2010 14:10:42 +0000 (15:10 +0100)
commit	42cf5e94ad3c096dc190583c5a180b304bb90d21
tree	603706587694a0d2fa06763b8b76662bc4e6dba9	tree \| snapshot
parent	2097e06808d135a3b2cb01f93a3b6dcfeb921d36	commit \| diff
parent	a2f7044f34eb5ac085eccd801883e8c9a892be8e	commit \| diff

Merge branch 'master' into dev_sal

Conflicts:
coreapi/linphonecore.h

coreapi/exevents.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_eXosip2_sdp.c	diff1 \|	\|	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/exevents.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_eXosip2_sdp.c	diff1 \|	\|	blob \| history
gtk-glade/main.c	diff1 \|	diff2 \|	blob \| history