sjero.net Git - linphone/commit

]> sjero.net Git - linphone/commit

author	Yann Diorcet <yann.diorcet@belledonne-communications.com>
	Wed, 9 Jan 2013 12:58:33 +0000 (13:58 +0100)
committer	Yann Diorcet <yann.diorcet@belledonne-communications.com>
	Wed, 9 Jan 2013 12:58:33 +0000 (13:58 +0100)
commit	3b20b898868fd028a84555f3b59fea2b9bd7572c
tree	94e734c9b361cc3021426b87d59564e75bebb8c0	tree \| snapshot
parent	a87c70e44ae50f19fdb48d9c8e666ecc2c9223bb	commit \| diff
parent	953949eba913d5f06a23facfc0be2cd12ce94dd0	commit \| diff

Merge branch 'master' of git.linphone.org:linphone into upnp

Conflicts:
coreapi/linphonecore.c
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/misc.c	diff1 \|	diff2 \|	blob \| history
coreapi/private.h	diff1 \|	diff2 \|	blob \| history
coreapi/proxy.c	diff1 \|	diff2 \|	blob \| history
gtk/Makefile.am	diff1 \|	diff2 \|	blob \| history
gtk/parameters.ui	diff1 \|	diff2 \|	blob \| history
gtk/propertybox.c	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/misc.c	diff1 \|	diff2 \|	blob \| history
coreapi/private.h	diff1 \|	diff2 \|	blob \| history
coreapi/proxy.c	diff1 \|	diff2 \|	blob \| history
gtk/Makefile.am	diff1 \|	diff2 \|	blob \| history
gtk/parameters.ui	diff1 \|	diff2 \|	blob \| history
gtk/propertybox.c	diff1 \|	diff2 \|	blob \| history
mediastreamer2	diff1 \|	diff2 \|	blob \| history