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

[gnunet]

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

ng0 pushed a commit to branch master
in repository gnunet.

commit cc3d270b525cdc4756fa706221fd4ad510539700
Merge: f002ecb54 e96ba1077
Author: ng0 <address@hidden>
AuthorDate: Wed Apr 3 12:19:26 2019 +0000

    Merge branch 'master' of gnunet.org:gnunet

 AUTHORS                              |   1 +
 ChangeLog                            |   5 +
 README                               |   4 +-
 configure.ac                         |  39 +++++
 contrib/guix/gnu/packages/gnunet.scm | 123 +++++++++++++-
 contrib/vagrant/bootstrap.ubuntu.sh  |   2 +-
 doc/system_specific/FROM_SOURCE      |   4 +-
 po/POTFILES.in                       |   1 +
 src/util/Makefile.am                 |  32 ++--
 src/util/gnunet-qr.c                 | 314 +++++++++++++++++++++++++++++++++++
 src/util/gnunet-qr.in                |  46 -----
 src/util/gnunet-qr.py                | 110 ------------
 12 files changed, 500 insertions(+), 181 deletions(-)

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