sjero.net Git - linphone/commit

]> sjero.net Git - linphone/commit

author	Simon Morlat <simon.morlat@linphone.org>
	Thu, 11 Mar 2010 13:38:58 +0000 (14:38 +0100)
committer	Simon Morlat <simon.morlat@linphone.org>
	Thu, 11 Mar 2010 13:38:58 +0000 (14:38 +0100)
commit	b39938c7fd55f8feaa135bdc3bbbc304f7e72b44
tree	1f797da756b4152cba7998b2e352a1e75f51a0b3	tree \| snapshot
parent	063776dad423d6af32afc3667c64c19f547a87e1	commit \| diff
parent	4d09f9af4e42f2777e9f451f1242d587398cdf62	commit \| diff

Merge branch 'master' of belledonne-communications.com:linphone-private into dev_sal

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

coreapi/linphonecore.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	diff1 \|	diff2 \|	blob \| history
coreapi/private.h	diff1 \|	diff2 \|	blob \| history
coreapi/proxy.c	diff1 \|	diff2 \|	blob \| history
gtk-glade/main.c	diff1 \|	diff2 \|	blob \| history
gtk-glade/propertybox.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/linphonecore.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	diff1 \|	diff2 \|	blob \| history
coreapi/private.h	diff1 \|	diff2 \|	blob \| history
coreapi/proxy.c	diff1 \|	diff2 \|	blob \| history
gtk-glade/main.c	diff1 \|	diff2 \|	blob \| history
gtk-glade/propertybox.c	diff1 \|	diff2 \|	blob \| history