[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 02/04: Merge branch 'master' of git+ssh://gnunet.o
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 02/04: Merge branch 'master' of git+ssh://gnunet.org/gnunet |
|
Date: |
Wed, 01 Mar 2017 20:06:20 +0100 |
This is an automated email from the git hooks/post-receive script.
bart-polot pushed a commit to branch master
in repository gnunet.
commit 466f3fe3101c78f5219b63ca8724697757104d87
Merge: cef53c8a3 13b340c41
Author: Bart Polot <address@hidden>
AuthorDate: Wed Mar 1 18:49:52 2017 +0100
Merge branch 'master' of git+ssh://gnunet.org/gnunet
src/Makefile.am | 5 +
src/block/block.c | 2 +-
src/block/plugin_block_template.c | 4 +-
src/cadet/cadet_api_new.c | 27 +-
src/cadet/gnunet-service-cadet-new.c | 20 +-
src/cadet/gnunet-service-cadet-new_channel.c | 10 +-
src/cadet/gnunet-service-cadet-new_tunnels.c | 12 +-
src/consensus/gnunet-consensus-profiler.c | 52 +-
src/consensus/gnunet-service-consensus.c | 48 ++
src/consensus/plugin_block_consensus.c | 2 +-
src/consensus/test_consensus.conf | 17 +-
src/dht/plugin_block_dht.c | 2 +-
src/fs/plugin_block_fs.c | 2 +-
src/gns/plugin_block_gns.c | 2 +-
src/include/gnunet_block_lib.h | 5 +
src/include/gnunet_plugin_lib.h | 2 +-
src/include/gnunet_sq_lib.h | 4 +-
src/multicast/gnunet-service-multicast.c | 2 +-
src/pq/pq_result_helper.c | 50 +-
src/regex/plugin_block_regex.c | 2 +-
src/revocation/Makefile.am | 17 +-
src/revocation/gnunet-service-revocation.c | 16 +-
.../plugin_block_revocation.c} | 143 ++++--
src/set/gnunet-service-set.c | 87 ++--
src/set/gnunet-service-set_union.c | 38 +-
src/set/gnunet-set-profiler.c | 48 +-
src/set/plugin_block_set_test.c | 2 +-
src/set/set_api.c | 6 +-
src/sq/sq.c | 2 +
src/sq/sq_result_helper.c | 554 ++++++++++++++++++++-
src/topology/friends.c | 18 +-
src/util/service_new.c | 4 +-
32 files changed, 978 insertions(+), 227 deletions(-)
--
To stop receiving notification emails like this one, please contact
address@hidden