]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c61a2b4 58dca09)
Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Mon, 23 May 2011 14:44:00 +0000 (16:44 +0200)
committerJehan Monnier <jehan.monnier@linphone.org>
Mon, 23 May 2011 14:44:00 +0000 (16:44 +0200)
Conflicts:
mediastreamer2

1  2 
gtk/linphone.h patch | diff1 | diff2 | blob | history

diff --cc gtk/linphone.h
Simple merge
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