[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 28/30: merge conflict resolution
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 28/30: merge conflict resolution |
Date: |
Wed, 03 Apr 2019 13:54:09 +0200 |
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
- [GNUnet-SVN] [gnunet] 19/30: configure.ac: Add check for libzbar (using pkgconfig)., (continued)
- [GNUnet-SVN] [gnunet] 19/30: configure.ac: Add check for libzbar (using pkgconfig)., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 20/30: gnunet-qr: Add into Makefile.am and pofiles,, gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 16/30: Add helper lib "gnunet-qr-utils.h"., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 11/30: contrib/guix: Add package zbar (for gnunet-qr)., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 26/30: gnunet-qr: Implement functionality of gnunet-uri, don't spawn., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 23/30: gnunet-qr: Use GNUNET_PROGRAM_run to simplify the code., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 24/30: contrib/guix: Add package zbar (for gnunet-qr)., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 13/30: gnunet-qr: Implement functionality of gnunet-uri, don't spawn., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 21/30: gnunet-qr: Use the `gnunet-uri` binary installed into PREFIX., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 22/30: gnunet-qr: Update documentation and scripts to changed dependencies., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 28/30: merge conflict resolution,
gnunet <=
- [GNUnet-SVN] [gnunet] 29/30: fix libzbar detection, gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 14/30: gnunet-qr: Reimplement in C - yet only a proof of concept., gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 30/30: Merge branch 'gnunet-qt-c-2', gnunet, 2019/04/03
- [GNUnet-SVN] [gnunet] 27/30: add error handling for gnunet-qr, gnunet, 2019/04/03