[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 02/04: Merge branch 'master' of gnunet.org:gnunet
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] 02/04: Merge branch 'master' of gnunet.org:gnunet |
|
Date: |
Tue, 03 Jul 2018 09:02:26 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnunet.
commit 061526a35bf19cd71e375ae7eb9dc3b5fd6c711f
Merge: c579fa83c bb3371542
Author: Nils Gillmann <address@hidden>
AuthorDate: Tue Jul 3 06:49:02 2018 +0000
Merge branch 'master' of gnunet.org:gnunet
contrib/.gitignore | 1 -
contrib/Makefile.am | 11 -
doc/man/Makefile.am | 1 +
doc/man/gnunet-gns.1 | 2 +-
doc/man/gnunet-timeout.1 | 20 ++
po/POTFILES.in | 1 +
src/gns/gns_api.c | 7 +-
src/gns/gnunet-gns.c | 10 +-
src/gns/nss/nss_gns.c | 269 +++++++++++----------
src/gns/nss/nss_gns_query.c | 25 +-
src/gns/nss/nss_gns_query.h | 30 ++-
src/identity/identity_api_lookup.c | 8 +-
src/rps/gnunet-service-rps.c | 7 +-
src/set/gnunet-service-set_intersection.c | 19 +-
src/set/gnunet-service-set_union.c | 19 +-
src/util/.gitignore | 5 +-
src/util/Makefile.am | 16 +-
src/util/client.c | 13 +-
src/util/dnsparser.c | 9 +-
.../util/gnunet-timeout-w32.c | 6 +-
.../util/gnunet-timeout.c | 82 ++++---
21 files changed, 334 insertions(+), 227 deletions(-)
--
To stop receiving notification emails like this one, please contact
address@hidden