Merge branch 'patch-5' of https://github.com/stal888/ProjectTox-Core into stal888-patch-5

This commit is contained in:
irungentoo 2014-05-21 15:31:25 -04:00
commit be4559de73
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98

View File

@ -1,6 +1,6 @@
if BUILD_DHT_BOOTSTRAP_DAEMON if BUILD_DHT_BOOTSTRAP_DAEMON
noinst_PROGRAMS += tox_bootstrap_daemon bin_PROGRAMS += tox_bootstrap_daemon
tox_bootstrap_daemon_SOURCES = \ tox_bootstrap_daemon_SOURCES = \
../other/bootstrap_daemon/tox_bootstrap_daemon.c ../other/bootstrap_daemon/tox_bootstrap_daemon.c
@ -24,4 +24,4 @@ endif
EXTRA_DIST += \ EXTRA_DIST += \
$(top_srcdir)/other/bootstrap_daemon/conf \ $(top_srcdir)/other/bootstrap_daemon/conf \
$(top_srcdir)/other/bootstrap_daemon/tox_bootstrap_daemon.sh $(top_srcdir)/other/bootstrap_daemon/tox_bootstrap_daemon.sh