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

[gnunet]

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

xrs pushed a commit to branch master
in repository gnunet.

commit 6ca4af1929f99b0bd49e4d39097ff6d0c331eddf
Merge: dd2ddaa45 37d4b1f14
Author: xrs <address@hidden>
AuthorDate: Wed Sep 20 20:27:01 2017 +0200

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

 contrib/Makefile.am                                |   1 +
 contrib/nssswitch.conf                             |  25 +
 .../packages/guix/{guix-env.scm => gnunet-doc.scm} |  99 +--
 contrib/packages/guix/guix-env.scm                 |  15 +-
 .../guix/packages/gnunet/packages/gnunet.scm       |  15 +-
 doc/Makefile.am                                    |  97 ++-
 doc/README.txt                                     |  42 ++
 doc/figs/Service.pdf                               | Bin 7303 -> 0 bytes
 doc/figs/System.pdf                                | Bin 7897 -> 0 bytes
 doc/gnunet-c-tutorial.pdf                          | Bin 293947 -> 0 bytes
 doc/gnunet-c-tutorial.texi                         |   6 +
 doc/images/daemon_lego_block.svg                   | 126 ++++
 doc/images/gnunet-tutorial-service.png             | Bin 0 -> 40142 bytes
 doc/images/gnunet-tutorial-system.png              | Bin 0 -> 46982 bytes
 doc/images/lego_stack.svg                          | 737 +++++++++++++++++++++
 doc/images/service_lego_block.svg                  | 345 ++++++++++
 src/cadet/gnunet-service-cadet.c                   |   1 +
 17 files changed, 1406 insertions(+), 103 deletions(-)

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