[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 03/03: Merge branch 'master' of gnunet.org:gnunet
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 03/03: Merge branch 'master' of gnunet.org:gnunet |
|
Date: |
Sun, 31 Dec 2017 13:17:30 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnunet.
commit ca391c48238c36462ca11be9299cc7c9a09e6bbe
Merge: bc524a244 dca8eb9c4
Author: ng0 <address@hidden>
AuthorDate: Sun Dec 31 12:17:15 2017 +0000
Merge branch 'master' of gnunet.org:gnunet
src/cadet/gnunet-service-cadet_tunnels.c | 4 +-
.../gnunet-helper-audio-playback-gst.c | 5 +
src/conversation/gnunet-helper-audio-playback.c | 5 +
src/conversation/gnunet_gst.c | 5 +
src/conversation/microphone.c | 4 +-
src/core/gnunet-service-core.c | 3 +
src/core/gnunet-service-core_kx.c | 3 +
src/fs/fs_dirmetascan.c | 3 +
src/fs/test_fs_download_persistence.c | 1 -
src/fs/test_fs_publish_persistence.c | 1 -
src/include/gnunet_common.h | 15 +-
src/include/gnunet_mst_lib.h | 4 +-
src/include/gnunet_network_lib.h | 6 +-
src/include/gnunet_protocols.h | 30 +-
src/include/gnunet_scheduler_lib.h | 44 +-
src/include/gnunet_service_lib.h | 7 +-
src/multicast/gnunet-service-multicast.c | 248 ++--
src/multicast/multicast_api.c | 51 +-
src/multicast/test_multicast_multipeer.c | 312 ++--
src/psyc/gnunet-service-psyc.c | 131 +-
src/psyc/psyc_api.c | 103 +-
src/psyc/test_psyc.c | 28 +-
src/psyc/test_psyc.conf | 16 +
src/psycstore/psycstore_api.c | 10 +-
src/social/gnunet-service-social.c | 774 +++++-----
src/social/gnunet-social.c | 26 +-
src/social/social_api.c | 292 ++--
src/social/test_social.c | 268 ++--
src/social/test_social.conf | 19 +
src/statistics/gnunet-service-statistics.c | 4 +-
src/testbed/gnunet-helper-testbed.c | 7 +-
src/transport/gnunet-helper-transport-wlan-dummy.c | 6 +
src/transport/plugin_transport_http_server.c | 2 +-
src/util/client.c | 41 +-
src/util/mq.c | 22 +
src/util/mst.c | 27 +-
src/util/network.c | 6 +-
src/util/program.c | 12 +-
src/util/scheduler.c | 1547 ++++++++++++--------
src/util/service.c | 31 +-
src/vpn/gnunet-service-vpn.c | 3 +
41 files changed, 2451 insertions(+), 1675 deletions(-)
--
To stop receiving notification emails like this one, please contact
address@hidden