]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
projects / thirdparty / pdns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7c25d4 c40b447)
Merge remote-tracking branch 'origin/master' into pdns-builder 6246/head
authorPieter Lexis <pieter.lexis@powerdns.com>
Tue, 2 Oct 2018 07:14:35 +0000 (09:14 +0200)
committerPieter Lexis <pieter.lexis@powerdns.com>
Tue, 2 Oct 2018 07:14:35 +0000 (09:14 +0200)
1  2 
pdns/recursordist/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc pdns/recursordist/Makefile.am
Simple merge
Unnamed repository; edit this file 'description' to name the repository.