]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1d6ab8 4b178dc)
Merge branch 'master' of git.linphone.org:linphone
authorYann Diorcet <yann.diorcet@belledonne-communications.com>
Thu, 23 Feb 2012 08:18:19 +0000 (09:18 +0100)
committerYann Diorcet <yann.diorcet@belledonne-communications.com>
Thu, 23 Feb 2012 08:18:19 +0000 (09:18 +0100)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
gtk/main.c patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc gtk/main.c
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