diff options
author | Phil <phil.buschmann@tum.de> | 2018-08-09 10:23:29 +0200 |
---|---|---|
committer | Phil <phil.buschmann@tum.de> | 2018-08-09 10:23:29 +0200 |
commit | e083dd6ae0b96f30328d0d54bc7a55f6cd34b2b4 (patch) | |
tree | 8c993110fb5958c30f41f40794bd75941a42aca0 /configure.ac | |
parent | cffad0ad30400dda7c7c4ef77ed7625013193dbe (diff) | |
parent | b3932f39b028d5db0d2e641e8593679c657b6bd1 (diff) | |
download | gnunet-e083dd6ae0b96f30328d0d54bc7a55f6cd34b2b4.tar.gz gnunet-e083dd6ae0b96f30328d0d54bc7a55f6cd34b2b4.zip |
-Merge branch 'master' into gsoc2018/rest_api
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index c7314d765..535ce0ffe 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1759,8 +1759,8 @@ src/zonemaster/Makefile | |||
1759 | src/zonemaster/zonemaster.conf | 1759 | src/zonemaster/zonemaster.conf |
1760 | src/rest/Makefile | 1760 | src/rest/Makefile |
1761 | src/abe/Makefile | 1761 | src/abe/Makefile |
1762 | src/identity-attribute/Makefile | 1762 | src/reclaim-attribute/Makefile |
1763 | src/identity-provider/Makefile | 1763 | src/reclaim/Makefile |
1764 | pkgconfig/Makefile | 1764 | pkgconfig/Makefile |
1765 | pkgconfig/gnunetarm.pc | 1765 | pkgconfig/gnunetarm.pc |
1766 | pkgconfig/gnunetats.pc | 1766 | pkgconfig/gnunetats.pc |