]> granicus.if.org Git - pdns/commitdiff
projects / pdns / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ec8d1b 229ac96)
Merge remote-tracking branch 'origin/master' into trustanchor.server
authorPieter Lexis <pieter.lexis@powerdns.com>
Mon, 17 Jun 2019 09:55:00 +0000 (11:55 +0200)
committerPieter Lexis <pieter.lexis@powerdns.com>
Mon, 17 Jun 2019 09:55:00 +0000 (11:55 +0200)
1  2 
pdns/pdns_recursor.cc patch | diff1 | diff2 | blob | history
pdns/syncres.cc patch | diff1 | diff2 | blob | history

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