sjero.net Git - linphone/commit

]> sjero.net Git - linphone/commit

author	Margaux Clerc <margaux.clerc@belledonne-communications>
	Thu, 18 Oct 2012 13:32:21 +0000 (15:32 +0200)
committer	Margaux Clerc <margaux.clerc@belledonne-communications>
	Thu, 18 Oct 2012 13:32:21 +0000 (15:32 +0200)
commit	212e987db958c3f447b96bf1b380ace57b25810b
tree	cf4ceb6ab72cfa2d673f5e5696f2c7baffe45122	tree \| snapshot
parent	389a9bcfd3a6912ddb5d6442d9c3d78638acbb45	commit \| diff
parent	d6a8aef9944b09b702e3449abf7fef23738529a4	commit \| diff

Merge remote-tracking branch 'origin/master' into dev_gtk_new_ui

Conflicts:
gtk/incall_view.c
gtk/main.ui

coreapi/chat.c	diff1 \|	diff2 \|	blob \| history
gtk/Makefile.am	diff1 \|	diff2 \|	blob \| history
gtk/incall_view.c	diff1 \|	diff2 \|	blob \| history
gtk/main.c	diff1 \|	diff2 \|	blob \| history
gtk/main.ui	diff1 \|	diff2 \|	blob \| history
po/POTFILES.in	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/chat.c	diff1 \|	diff2 \|	blob \| history
gtk/Makefile.am	diff1 \|	diff2 \|	blob \| history
gtk/incall_view.c	diff1 \|	diff2 \|	blob \| history
gtk/main.c	diff1 \|	diff2 \|	blob \| history
gtk/main.ui	diff1 \|	diff2 \|	blob \| history
po/POTFILES.in	diff1 \|	diff2 \|	blob \| history