Merge pull request #3931 from zeha/rename-notify

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Tue, 7 Jun 2016 12:32:35 +0000 (14:32 +0200)

committer Pieter Lexis <pieterlexis@users.noreply.github.com>

Tue, 7 Jun 2016 12:32:35 +0000 (14:32 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 7 Jun 2016 12:32:35 +0000 (14:32 +0200)
committer Pieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 7 Jun 2016 12:32:35 +0000 (14:32 +0200)
diff --cc docs/Makefile.am
Simple merge
diff --cc docs/mkdocs.yml
Simple merge
diff --cc pdns/Makefile.am

index 4434692c61fc5423aee7faf12c4739a3d9c050dd,de08741b18cffbd3202a39f6514544a28cbea20f..9f34b84d2544a9494e60f87534393d10d343e47a
--- 1/pdns/Makefile.am
--- 2/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@@ -82,9 -83,10 +82,9 @@@ bin_PROGRAMS += 
         dnsreplay \
         dnsscan \
         dnsscope \
- -      dnstcpbench \
         dnswasher \
         dumresp \
-       notify \
+       pdns_notify \
         nproxy \
         nsec3dig \
         saxfr \
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Tue, 7 Jun 2016 12:32:35 +0000 (14:32 +0200)
committer	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Tue, 7 Jun 2016 12:32:35 +0000 (14:32 +0200)
		1	2
docs/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
docs/mkdocs.yml	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history