]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42e4255 98cfcb3)
Merge branch 'dev_ice'
authorGhislain MARY <ghislain.mary@belledonne-communications.com>
Thu, 16 Aug 2012 10:01:29 +0000 (12:01 +0200)
committerGhislain MARY <ghislain.mary@belledonne-communications.com>
Thu, 16 Aug 2012 10:01:29 +0000 (12:01 +0200)
1  2 
coreapi/offeranswer.c patch | diff1 | diff2 | blob | history

diff --cc coreapi/offeranswer.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