]> sjero.net Git - linphone/commit
projects / linphone / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9c814fc 1fbfa82)
Merge branch 'master' into dev_sal
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 3 Mar 2010 15:16:16 +0000 (16:16 +0100)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 3 Mar 2010 15:16:16 +0000 (16:16 +0100)
commitec6f061ea7a0fd876a4ecf065c9d789158820d1d
tree0b1c549512d202abdf158ff6327e2c329eaa116atree | snapshot
parent9c814fc357e5226220e586f0d42812876e89d40dcommit | diff
parent1fbfa824ae0cac8bc700b11c30c5bbdc88bdf79acommit | diff
Merge branch 'master' into dev_sal

Conflicts:
coreapi/address.c
coreapi/linphonecore.c
coreapi/Makefile.am diff1 | diff2 | blob | history
coreapi/address.c diff1 | diff2 | blob | history
coreapi/linphonecore.c diff1 | diff2 | blob | history
gtk-glade/main.c 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