[GNUnet-SVN] [gnunet] 112/171: Merge remote-tracking branch 'origin/master' into identity_abe

[gnunet]

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

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 41315cebe1d0a074445f28d915d7d038dea80465
Merge: 1eb75229e 37d4b1f14
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Fri Sep 15 09:23:59 2017 +0200

    Merge remote-tracking branch 'origin/master' into identity_abe

 README                                             |    1 +
 contrib/Makefile.am                                |    1 +
 contrib/nssswitch.conf                             |   25 +
 contrib/packages/guix/README                       |   39 +
 .../packages/guix/gnunet-doc.scm                   |  120 +-
 guix-env.scm => contrib/packages/guix/guix-env.scm |   38 +-
 .../guix/packages/gnunet/packages/gnunet.scm       |  474 ++++++
 default.nix => contrib/packages/nix/default.nix    |    0
 .../packages/nix/gnunet-dev.nix                    |    0
 doc/Makefile.am                                    |  160 +-
 doc/README.txt                                     |   42 +
 doc/chapters/developer.texi                        |   58 +-
 doc/chapters/installation.texi                     |  831 ++---------
 doc/chapters/philosophy.texi                       |   37 +-
 doc/chapters/user.texi                             |  289 ++--
 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.tex                          | 1529 --------------------
 doc/gnunet-c-tutorial.texi                         | 1181 +++++++++++++++
 doc/gnunet.texi                                    |   15 +-
 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 +++++
 doc/outdated-and-old-installation-instructions.txt |  672 +++++++++
 doc/tutorial-examples/001.c                        |   29 +
 doc/tutorial-examples/002.c                        |   17 +
 doc/tutorial-examples/003.c                        |    7 +
 doc/tutorial-examples/004.c                        |    5 +
 doc/tutorial-examples/005.c                        |    8 +
 doc/tutorial-examples/006.c                        |   31 +
 doc/tutorial-examples/007.c                        |   10 +
 doc/tutorial-examples/008.c                        |   22 +
 doc/tutorial-examples/009.c                        |    9 +
 doc/tutorial-examples/010.c                        |    8 +
 doc/tutorial-examples/011.c                        |    8 +
 doc/tutorial-examples/012.c                        |    4 +
 doc/tutorial-examples/013.c                        |   12 +
 doc/tutorial-examples/014.c                        |    9 +
 doc/tutorial-examples/015.c                        |    8 +
 doc/tutorial-examples/016.c                        |    3 +
 doc/tutorial-examples/017.c                        |    3 +
 doc/tutorial-examples/018.c                        |    2 +
 doc/tutorial-examples/019.c                        |   15 +
 doc/tutorial-examples/020.c                        |   24 +
 doc/tutorial-examples/021.c                        |   13 +
 doc/tutorial-examples/022.c                        |    8 +
 doc/tutorial-examples/023.c                        |   17 +
 doc/tutorial-examples/024.c                        |    9 +
 doc/tutorial-examples/025.c                        |   15 +
 doc/tutorial-examples/026.c                        |   52 +
 src/arm/gnunet-service-arm.c                       |   16 +-
 src/cadet/gnunet-service-cadet.c                   |    1 +
 55 files changed, 4554 insertions(+), 2531 deletions(-)

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