]> sjero.net Git - linphone/commit
projects / linphone / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6260706 9bd55d0)
Merge branch 'dev_lsd' into dev_multicall
authorSimon Morlat <simon.morlat@linphone.org>
Mon, 31 May 2010 15:27:37 +0000 (17:27 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Mon, 31 May 2010 15:27:37 +0000 (17:27 +0200)
commitd5bcf73fd6351a45854b540d728bad03fd1ddc24
tree984436e44b4977145885405baa0a11fa2286d58atree | snapshot
parent626070658548bf44d57d65359bad2b97d33d7e00commit | diff
parent9bd55d0b34286d55e89a9c2df61c774f1b4d53aacommit | diff
Merge branch 'dev_lsd' into dev_multicall

Conflicts:
coreapi/callbacks.c
coreapi/linphonecore.c
coreapi/Makefile.am diff1 | diff2 | blob | history
coreapi/callbacks.c diff1 | diff2 | blob | history
coreapi/linphonecore.c diff1 | diff2 | blob | history
coreapi/linphonecore.h diff1 | diff2 | blob | history
coreapi/private.h diff1 | diff2 | blob | history
mediastreamer2 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