gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnunet] 02/03: Merge branch 'master' of ssh://gnunet.org/g


From: gnunet
Subject: [GNUnet-SVN] [gnunet] 02/03: Merge branch 'master' of ssh://gnunet.org/gnunet
Date: Thu, 28 Jun 2018 01:39:31 +0200

This is an automated email from the git hooks/post-receive script.

t3sserakt pushed a commit to branch master
in repository gnunet.

commit f4279d5bfd1e10fa668a262226cb159910f08680
Merge: b294b0e78 7540ebcd0
Author: t3sserakt <address@hidden>
AuthorDate: Thu Jun 28 01:36:18 2018 +0200

    Merge branch 'master' of ssh://gnunet.org/gnunet

 configure.ac                                       |   3 -
 contrib/conf/gnunet/no_autostart_above_core.conf   |   3 +
 contrib/conf/gnunet/no_forcestart.conf             |  16 +
 doc/documentation/Makefile.am                      |   1 +
 doc/documentation/chapters/developer.texi          | 188 ++---
 doc/documentation/chapters/installation.texi       | 158 ++++
 .../chapters/{philosophy.texi => keyconcepts.texi} | 164 +---
 doc/documentation/chapters/philosophy.texi         | 446 +----------
 doc/documentation/chapters/user.texi               | 890 +++++++++++----------
 doc/documentation/gnunet.texi                      |  31 +-
 doc/man/gnunet-revocation.1                        |   2 +-
 doc/release_policy.rfc.txt                         |   2 +-
 m4/iconv.m4                                        |   2 +-
 m4/lib-link.m4                                     |   2 +-
 m4/lib-prefix.m4                                   |   2 +-
 pkgconfig/Makefile.am                              |   3 -
 pkgconfig/gnunetdnsparser.pc.in                    |  12 -
 pkgconfig/gnunetdnsstub.pc.in                      |  12 -
 pkgconfig/gnunettun.pc.in                          |  12 -
 po/de.po                                           |   4 +-
 po/es.po                                           |   2 +-
 po/fr.po                                           |   2 +-
 po/sv.po                                           |   2 +-
 po/vi.po                                           |   2 +-
 po/zh_CN.po                                        |   2 +-
 src/ats/gnunet-service-ats_addresses.h             |   2 +-
 src/cadet/gnunet-cadet.c                           |  25 +-
 src/cadet/gnunet-service-cadet.c                   |  12 +-
 src/cadet/gnunet-service-cadet_peer.c              |   2 +
 src/consensus/gnunet-service-consensus.c           |   2 +-
 src/conversation/gnunet-conversation.c             |   9 +-
 src/core/core.h                                    |   2 +-
 src/core/gnunet-service-core.c                     |   2 +-
 src/core/gnunet-service-core.h                     |   2 +-
 src/core/gnunet-service-core_kx.c                  |   6 +-
 src/core/gnunet-service-core_sessions.c            |   2 +-
 src/core/gnunet-service-core_sessions.h            |   2 +-
 src/datastore/perf_datastore_api.c                 |   2 +-
 src/datastore/plugin_datastore_mysql.c             |   2 +-
 src/fs/gnunet-service-fs_cp.h                      |   2 +-
 src/include/block_dns.h                            |   2 +-
 src/include/gnunet_core_service.h                  |   2 +-
 src/include/gnunet_os_lib.h                        |   4 +-
 src/include/gnunet_psyc_service.h                  |   2 +-
 src/include/gnunet_secretsharing_service.h         |   4 +-
 src/include/gnunet_signatures.h                    |   2 +-
 src/namestore/test_namestore_api_sqlite.conf       |   2 +-
 src/nat/gnunet-helper-nat-server.c                 |   3 +
 src/rps/gnunet-rps.c                               |   5 +
 src/rps/gnunet-service-rps.c                       |  23 +-
 src/rps/test_rps.c                                 |   9 +
 src/secretsharing/gnunet-service-secretsharing.c   |   2 +-
 src/secretsharing/secretsharing_api.c              |   4 +-
 src/secretsharing/secretsharing_protocol.h         |   2 +-
 src/set/gnunet-service-set.h                       |   2 +-
 src/set/gnunet-service-set_intersection.c          |   4 +-
 src/set/gnunet-service-set_union.c                 |   4 +-
 src/topology/gnunet-daemon-topology.c              |   2 +-
 src/transport/gnunet-service-transport.c           |   4 +-
 .../gnunet-service-transport_neighbours.c          |   4 +-
 src/transport/transport.conf.in                    |   3 +-
 src/util/common_allocation.c                       |   1 -
 src/util/disk.c                                    |   1 -
 src/util/os_priority.c                             |   6 +-
 64 files changed, 924 insertions(+), 1210 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]