From: Pieter Lexis <pieterlexis@users.noreply.github.com>
Date: Tue, 7 Jun 2016 12:32:35 +0000 (+0200)
Subject: Merge pull request #3931 from zeha/rename-notify
X-Git-Tag: rec-4.0.0-rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5ff385ae2b0d638a8847a61be0d98b3ee3cc082;p=thirdparty%2Fpdns.git

Merge pull request #3931 from zeha/rename-notify

Rename notify to pdns_notify to avoid conflicts
---

e5ff385ae2b0d638a8847a61be0d98b3ee3cc082
diff --cc pdns/Makefile.am
index 4434692c61,de08741b18..9f34b84d25
--- a/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 \