]> granicus.if.org Git - pdns/commitdiff
projects / pdns / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86f3ca5 391b7fb)
Merge branch 'master' into ednssubnet
authorbert hubert <bert.hubert@netherlabs.nl>
Tue, 10 Nov 2015 07:52:04 +0000 (08:52 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Tue, 10 Nov 2015 07:52:04 +0000 (08:52 +0100)
Conflicts:
pdns/dnsname.hh

1  2 
pdns/Makefile.am patch | diff1 | diff2 | blob | history

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