]> sjero.net Git - linphone/commit
projects / linphone / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0741eb1 9f6b1ce)
Merge branch 'master' into dev_multicall
authorSimon Morlat <simon.morlat@linphone.org>
Wed, 12 May 2010 08:00:49 +0000 (10:00 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Wed, 12 May 2010 08:00:49 +0000 (10:00 +0200)
commit715a680693fd1d89319ecfbd51ca210411665b55
tree62ef464deb7dfb5f364a06b97ace338f24e74874tree | snapshot
parent0741eb17a219b36c04c4f8e19969e03d691f3f8ecommit | diff
parent9f6b1ce513656d6340823737374d787dd03eb7ebcommit | diff
Merge branch 'master' into dev_multicall

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