]> sjero.net Git - linphone/commitdiff
projects / linphone / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b236a9 187ad65)
Merge branch 'master' into dev_sal
authorSimon Morlat <simon.morlat@linphone.org>
Tue, 2 Feb 2010 15:25:52 +0000 (16:25 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Tue, 2 Feb 2010 15:25:52 +0000 (16:25 +0100)
Conflicts:
coreapi/private.h

1  2 
coreapi/exevents.c patch | diff1 | diff2 | blob | history

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