diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2016-12-16 23:59:26 +0100 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2016-12-16 23:59:26 +0100 |
commit | 73a127e962c5ecbfc002b1b0c9ea9cf441591c6d (patch) | |
tree | 103d48cd12108c2033513fb539719bb5d05ed883 /configure.ac | |
parent | 7a6a665cea13854c28384fd4e51da0f10b4933cc (diff) | |
parent | a1e76003ca590ea8d3e9387da35d87419417abb8 (diff) | |
download | gnunet-73a127e962c5ecbfc002b1b0c9ea9cf441591c6d.tar.gz gnunet-73a127e962c5ecbfc002b1b0c9ea9cf441591c6d.zip |
Merge remote-tracking branch 'origin/master' into credentials
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 38b3660b1..761086e32 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1597,6 +1597,7 @@ src/namecache/namecache.conf | |||
1597 | src/namestore/Makefile | 1597 | src/namestore/Makefile |
1598 | src/namestore/namestore.conf | 1598 | src/namestore/namestore.conf |
1599 | src/nat/Makefile | 1599 | src/nat/Makefile |
1600 | src/nat/nat.conf | ||
1600 | src/nse/Makefile | 1601 | src/nse/Makefile |
1601 | src/nse/nse.conf | 1602 | src/nse/nse.conf |
1602 | src/peerinfo/Makefile | 1603 | src/peerinfo/Makefile |