sjero.net Git - linphone/commit

]> sjero.net Git - linphone/commit

author	Yann Diorcet <yann.diorcet@belledonne-communications.com>
	Fri, 25 Jan 2013 11:01:50 +0000 (12:01 +0100)
committer	Yann Diorcet <yann.diorcet@belledonne-communications.com>
	Fri, 25 Jan 2013 11:01:50 +0000 (12:01 +0100)
commit	5c939acd698e80f94de3014393c907d6d5642456
tree	fcf39e92ccae75f19d4170865ee4cecfbf44658d	tree \| snapshot
parent	39bbe2656bec0e51b8b0c7cffd92faf38de2cd7a	commit \| diff
parent	8fed4df37f8c49addf3607fd5d6df829da0614fd	commit \| diff

Merge branch 'upnp'

Conflicts:
coreapi/callbacks.c
coreapi/linphonecore.c
gtk/Makefile.am
mediastreamer2

configure.ac	diff1 \|	diff2 \|	blob \| history
coreapi/callbacks.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecall.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	diff1 \|	diff2 \|	blob \| history
coreapi/misc.c	diff1 \|	diff2 \|	blob \| history
coreapi/private.h	diff1 \|	diff2 \|	blob \| history
mediastreamer2	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

configure.ac	diff1 \|	diff2 \|	blob \| history
coreapi/callbacks.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecall.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.c	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	diff1 \|	diff2 \|	blob \| history
coreapi/misc.c	diff1 \|	diff2 \|	blob \| history
coreapi/private.h	diff1 \|	diff2 \|	blob \| history
mediastreamer2	diff1 \|	diff2 \|	blob \| history