[GNUnet-SVN] [gnunet] 06/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 92b6a83e9ba576ba237d47d780f3b9b10bb26588
Merge: 9356f42f5 17e755c71
Author: xrs <address@hidden>
AuthorDate: Wed Oct 25 22:36:10 2017 +0200

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

 AUTHORS                                            |    2 +-
 README                                             |    4 +-
 bootstrap                                          |    5 +
 configure.ac                                       |    6 +
 contrib/Makefile.am                                |   15 +-
 contrib/packages/guix/gnunet-doc.scm               |   14 +-
 contrib/packages/guix/gnunet.scm                   |   14 +-
 contrib/packages/guix/guix-env.scm                 |    1 +
 .../guix/packages/gnunet/packages/gnunet.scm       |    4 +
 doc/.gitignore                                     |   11 +-
 doc/Makefile.am                                    |  227 +-
 doc/README.txt                                     |   42 -
 doc/chapters/developer.texi                        | 7487 ------------------
 doc/chapters/installation.texi                     | 3625 ---------
 doc/chapters/user.texi                             | 1819 -----
 doc/{ => documentation}/Makefile.am                |  101 +-
 doc/documentation/README.txt                       |   69 +
 doc/documentation/chapters/configuration.texi      |    5 +
 doc/documentation/chapters/developer.texi          | 8304 ++++++++++++++++++++
 doc/documentation/chapters/installation.texi       | 3995 ++++++++++
 doc/{ => documentation}/chapters/philosophy.texi   |  312 +-
 doc/documentation/chapters/user.texi               | 2009 +++++
 doc/documentation/chapters/vocabulary.texi         |   57 +
 doc/documentation/docstyle.css                     |   76 +
 doc/{ => documentation}/fdl-1.3.texi               |    0
 doc/documentation/gendocs.sh                       |  504 ++
 doc/documentation/gendocs_template                 |   91 +
 doc/documentation/gendocs_template_min             |   93 +
 doc/{ => documentation}/gnunet-c-tutorial.texi     |  826 +-
 doc/{ => documentation}/gnunet.texi                |  129 +-
 doc/{ => documentation}/gpl-3.0.texi               |    0
 doc/documentation/htmlxref.cnf                     |  668 ++
 .../images/daemon_lego_block.png                   |  Bin
 .../images/daemon_lego_block.svg                   |    0
 .../images/gnunet-0-10-peerinfo.png                |  Bin
 .../images/gnunet-fs-gtk-0-10-star-tab.png         |  Bin
 .../images/gnunet-gtk-0-10-download-area.png       |  Bin
 .../images/gnunet-gtk-0-10-fs-menu.png             |  Bin
 .../images/gnunet-gtk-0-10-fs-publish-editing.png  |  Bin
 .../images/gnunet-gtk-0-10-fs-publish-select.png   |  Bin
 .../gnunet-gtk-0-10-fs-publish-with-file.png       |  Bin
 .../gnunet-gtk-0-10-fs-publish-with-file_0.png     |  Bin
 .../images/gnunet-gtk-0-10-fs-publish.png          |  Bin
 .../images/gnunet-gtk-0-10-fs-published.png        |  Bin
 .../images/gnunet-gtk-0-10-fs-search.png           |  Bin
 .../images/gnunet-gtk-0-10-fs.png                  |  Bin
 .../images/gnunet-gtk-0-10-gns-a-done.png          |  Bin
 .../images/gnunet-gtk-0-10-gns-a.png               |  Bin
 .../images/gnunet-gtk-0-10-gns.png                 |  Bin
 .../images/gnunet-gtk-0-10-identity.png            |  Bin
 .../images/gnunet-gtk-0-10-search-selected.png     |  Bin
 .../images/gnunet-gtk-0-10-traffic.png             |  Bin
 doc/{ => documentation}/images/gnunet-gtk-0-10.png |  Bin
 .../images/gnunet-namestore-gtk-phone.png          |  Bin
 .../images/gnunet-namestore-gtk-vpn.png            |  Bin
 .../images/gnunet-setup-exit.png                   |  Bin
 .../images/gnunet-tutorial-service.png             |  Bin
 .../images/gnunet-tutorial-system.png              |  Bin
 .../images/iceweasel-preferences.png               |  Bin
 doc/{ => documentation}/images/iceweasel-proxy.png |  Bin
 doc/{ => documentation}/images/lego_stack.svg      |    0
 .../images/service_lego_block.png                  |  Bin
 .../images/service_lego_block.svg                  |    0
 doc/{ => documentation}/images/service_stack.png   |  Bin
 doc/{ => documentation}/images/structure.dot       |    0
 doc/documentation/index.html                       |   31 +
 doc/documentation/run-gendocs.sh                   |   18 +
 doc/{ => documentation}/testbed_test.c             |    0
 doc/{ => documentation}/tutorial-examples/001.c    |    0
 doc/{ => documentation}/tutorial-examples/002.c    |    0
 doc/documentation/tutorial-examples/003.c          |   11 +
 doc/{ => documentation}/tutorial-examples/004.c    |    0
 doc/{ => documentation}/tutorial-examples/005.c    |    0
 doc/{ => documentation}/tutorial-examples/006.c    |    0
 doc/{ => documentation}/tutorial-examples/007.c    |    0
 doc/{ => documentation}/tutorial-examples/008.c    |    0
 doc/{ => documentation}/tutorial-examples/009.c    |    0
 doc/{ => documentation}/tutorial-examples/010.c    |    0
 doc/{ => documentation}/tutorial-examples/011.c    |    0
 doc/{ => documentation}/tutorial-examples/012.c    |    0
 doc/documentation/tutorial-examples/013.1.c        |    3 +
 doc/{ => documentation}/tutorial-examples/013.c    |    0
 doc/{ => documentation}/tutorial-examples/014.c    |    0
 doc/{ => documentation}/tutorial-examples/015.c    |    0
 doc/{ => documentation}/tutorial-examples/016.c    |    3 +-
 doc/documentation/tutorial-examples/017.c          |    4 +
 doc/{ => documentation}/tutorial-examples/018.c    |    0
 doc/{ => documentation}/tutorial-examples/019.c    |    7 +-
 doc/{ => documentation}/tutorial-examples/020.c    |    3 +-
 doc/{ => documentation}/tutorial-examples/021.c    |    0
 doc/{ => documentation}/tutorial-examples/022.c    |    0
 doc/{ => documentation}/tutorial-examples/023.c    |    0
 doc/{ => documentation}/tutorial-examples/024.c    |    0
 doc/{ => documentation}/tutorial-examples/025.c    |    0
 doc/{ => documentation}/tutorial-examples/026.c    |    0
 doc/hacks.el                                       |   17 +
 doc/tutorial-examples/003.c                        |    7 -
 doc/tutorial-examples/017.c                        |    3 -
 src/arm/Makefile.am                                |    3 +-
 src/dht/Makefile.am                                |    3 +-
 src/include/gnunet_scheduler_lib.h                 |   16 +
 src/integration-tests/Makefile.am                  |    3 +-
 src/statistics/Makefile.am                         |    3 +-
 src/util/scheduler.c                               |   48 +-
 104 files changed, 16934 insertions(+), 13764 deletions(-)


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