[GNUnet-SVN] [gnunet] 28/30: merge conflict resolution

[gnunet]

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

grothoff pushed a commit to branch master
in repository gnunet.

commit 1c53d67c25a877901e5ff5a8421ccc5972751838
Merge: 311795caa 9f8374622
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Apr 3 13:47:48 2019 +0200

    merge conflict resolution

 README               | 2 --
 src/util/Makefile.am | 6 ------
 2 files changed, 8 deletions(-)

diff --cc README
index 1d31a0a6a,b5ba741f2..1841bb616
--- a/README
+++ b/README
@@@ -122,25 -74,20 +122,23 @@@ These are the optional dependencies
  - libopus            >= 1.0.1       (for experimental conversation tool)
  - libpulse           >= 2.0         (for experimental conversation tool)
  - libogg             >= 1.3.0       (for experimental conversation tool)
 -- libnss                            (certtool binary (for convenient 
installation of GNS proxy))
 +- libnss                            (certtool binary (for convenient
 +                                     installation of GNS proxy))
  - libzbar            >= 0.10        (for gnunet-qr)
 +- libpbc             >= 0.5.14      (for Attribute-Based Encryption and
 +                                     Identity Provider functionality)
 +- libgabe                           (for Attribute-Based Encryption and
 +                                     Identity Provider functionality, from
 +                                     https://github.com/schanzen/libgabe)
 +- mandoc                            (for linting of man pages, generation of
 +                                     html output of man pages)
 +- miniupnpc
 +- perl5                             (for some utilities)
- - python2.7          = 2.7          (for gnunet-qr, only python 2.7
-                                      supported)
  - TeX Live           >= 2012        (for gnunet-bcd[*])
  - texi2mdoc                         (for automatic mdoc generation [*2])
 -- libglpk            >= 4.45        (for experimental code)
 -- perl5                             (for some utilities)
 -- guile              1.6.4          (or later up to 1.8?, for 
gnunet-download-manager)
 -- bluez                             (for bluetooth support)
 -- miniupnpc
 -- libpbc             >= 0.5.14      (for Attribute-Based Encryption and 
Identity Provider functionality)
 -- libgabe                           (for Attribute-Based Encryption and 
Identity Provider functionality,
 -                                    from https://github.com/schanzen/libgabe)
  
  Recommended autotools for compiling the Git version are:
 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
  - autoconf           >= 2.59
  - automake           >= 1.11.1

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