summaryrefslogtreecommitdiff
path: root/other/Makefile.inc
diff options
context:
space:
mode:
authormannol <eniz_vukovic@hotmail.com>2014-02-23 23:24:07 +0100
committermannol <eniz_vukovic@hotmail.com>2014-02-23 23:24:07 +0100
commitcf8a090cdeeb2630730203144001f1357b25ee01 (patch)
treeac52dcc5d043248cd719004d4eaffde64a65e3d3 /other/Makefile.inc
parent4888d916d037e371c88d39951f24f6ef4219c7cc (diff)
parentf219fb4ac1bf60eea3117df4aa8615cd07738a69 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'other/Makefile.inc')
-rw-r--r--other/Makefile.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/other/Makefile.inc b/other/Makefile.inc
index 5ec2fc2a..72a514ad 100644
--- a/other/Makefile.inc
+++ b/other/Makefile.inc
@@ -15,5 +15,5 @@ DHT_bootstrap_LDADD = $(LIBSODIUM_LDFLAGS) \
15 $(NACL_LIBS) \ 15 $(NACL_LIBS) \
16 $(WINSOCK2_LIBS) 16 $(WINSOCK2_LIBS)
17 17
18EXTRA_DIST += $(top_srcdir)/other/DHTservers \ 18EXTRA_DIST += $(top_srcdir)/other/DHTnodes \
19 $(top_srcdir)/other/tox.png 19 $(top_srcdir)/other/tox.png