]> granicus.if.org Git - pdns/commitdiff
projects / pdns / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f57838 88ca889)
Merge remote-tracking branch 'origin/master' into tsig-ixfr
authorbert hubert <bert.hubert@netherlabs.nl>
Fri, 8 Jan 2016 09:41:52 +0000 (10:41 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Fri, 8 Jan 2016 09:41:52 +0000 (10:41 +0100)
1  2 
pdns/resolver.cc patch | diff1 | diff2 | blob | history

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