diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-08-03 19:21:28 +0900 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-08-03 19:21:28 +0900 |
commit | 02c92c69ab4193b81ac6f90b52fecb40b94b9208 (patch) | |
tree | 0cbbfc249451abd23b238a811f42015df95bbe2a /src/util/Makefile.am | |
parent | b6755fe23d258a4dc971d8fabc3fae1873e31271 (diff) | |
parent | 6bcc73a1cbb1d4a609884762eab1b6de761ad1d9 (diff) | |
download | gnunet-02c92c69ab4193b81ac6f90b52fecb40b94b9208.tar.gz gnunet-02c92c69ab4193b81ac6f90b52fecb40b94b9208.zip |
Merge remote-tracking branch 'origin/master' into identity_abe
Diffstat (limited to 'src/util/Makefile.am')
-rw-r--r-- | src/util/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 62cf03684..cc9ff4745 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am | |||
@@ -347,10 +347,10 @@ test_client_unix_nc_SOURCES = \ | |||
347 | test_client_unix_nc_LDADD = \ | 347 | test_client_unix_nc_LDADD = \ |
348 | libgnunetutil.la | 348 | libgnunetutil.la |
349 | 349 | ||
350 | test_socks_nc_SOURCES = \ | 350 | #test_socks_nc_SOURCES = \ |
351 | test_socks.c | 351 | # test_socks.c |
352 | test_socks_nc_LDADD = \ | 352 | #test_socks_nc_LDADD = \ |
353 | libgnunetutil.la | 353 | # libgnunetutil.la |
354 | 354 | ||
355 | test_common_allocation_SOURCES = \ | 355 | test_common_allocation_SOURCES = \ |
356 | test_common_allocation.c | 356 | test_common_allocation.c |