aboutsummaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-04-03 13:47:48 +0200
committerChristian Grothoff <christian@grothoff.org>2019-04-03 13:47:48 +0200
commit1c53d67c25a877901e5ff5a8421ccc5972751838 (patch)
treefabbbfcad3cacaf7dbab4a90d2c8f6810a750b54 /README
parent311795caa390858b627428629a6621def8949a7c (diff)
parent9f8374622c5b258cabb51b115a839d6cb2faeed6 (diff)
downloadgnunet-1c53d67c25a877901e5ff5a8421ccc5972751838.tar.gz
gnunet-1c53d67c25a877901e5ff5a8421ccc5972751838.zip
merge conflict resolution
Diffstat (limited to 'README')
-rw-r--r--README2
1 files changed, 0 insertions, 2 deletions
diff --git a/README b/README
index 1d31a0a6a..1841bb616 100644
--- a/README
+++ b/README
@@ -134,8 +134,6 @@ These are the optional dependencies:
134 html output of man pages) 134 html output of man pages)
135- miniupnpc 135- miniupnpc
136- perl5 (for some utilities) 136- perl5 (for some utilities)
137- python2.7 = 2.7 (for gnunet-qr, only python 2.7
138 supported)
139- TeX Live >= 2012 (for gnunet-bcd[*]) 137- TeX Live >= 2012 (for gnunet-bcd[*])
140- texi2mdoc (for automatic mdoc generation [*2]) 138- texi2mdoc (for automatic mdoc generation [*2])
141 139