]> sjero.net Git - linphone/commit
projects / linphone / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a164581 d55c0fb)
Merge branch 'master' of git.linphone.org:linphone into upnp
authorYann Diorcet <yann.diorcet@belledonne-communications.com>
Thu, 17 Jan 2013 14:34:58 +0000 (15:34 +0100)
committerYann Diorcet <yann.diorcet@belledonne-communications.com>
Thu, 17 Jan 2013 14:34:58 +0000 (15:34 +0100)
commit35d65d36f26eac8efdb5894e294327c6ee954c8e
treed10080d0793f0c65afd5b15b38b5faf349289e5etree | snapshot
parenta1645810cbca630763cf79207f32af954b49c921commit | diff
parentd55c0fbf6e48ebe1e14a4ad8772b6d9710f96584commit | diff
Merge branch 'master' of git.linphone.org:linphone into upnp

Conflicts:
coreapi/linphone_tunnel.cc
mediastreamer2
13 files changed:
configure.ac diff1 | diff2 | blob | history
coreapi/Makefile.am diff1 | diff2 | blob | history
coreapi/callbacks.c diff1 | diff2 | blob | history
coreapi/linphone_tunnel.cc diff1 | diff2 | blob | history
coreapi/linphone_tunnel.h diff1 | diff2 | blob | history
coreapi/linphone_tunnel_config.c | | blob
coreapi/linphone_tunnel_stubs.c diff1 | | blob | history
coreapi/linphonecore.c diff1 | diff2 | blob | history
coreapi/linphonecore.h diff1 | diff2 | blob | history
coreapi/private.h diff1 | diff2 | blob | history
gtk/parameters.ui diff1 | diff2 | blob | history
gtk/propertybox.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