]> granicus.if.org Git - pdns/commitdiff
Merge pull request #4163 from pieterlexis/license-woes
authorRemi Gacogne <rgacogne@users.noreply.github.com>
Thu, 25 Aug 2016 08:41:21 +0000 (10:41 +0200)
committerGitHub <noreply@github.com>
Thu, 25 Aug 2016 08:41:21 +0000 (10:41 +0200)
More licensing everywhere

23 files changed:
1  2 
pdns/bpf-filter.cc
pdns/bpf-filter.hh
pdns/dnsdist-carbon.cc
pdns/dnsdist-console.cc
pdns/dnsdist-dynbpf.cc
pdns/dnsdist-dynbpf.hh
pdns/dnsdist-lua.cc
pdns/dnsdist-lua2.cc
pdns/dnsdist-tcp.cc
pdns/dnsdist-web.cc
pdns/dnsdist.cc
pdns/dnsdist.hh
pdns/dnspacket.cc
pdns/dnspacket.hh
pdns/dnsrulactions.hh
pdns/iputils.cc
pdns/iputils.hh
pdns/misc.cc
pdns/misc.hh
pdns/protobuf.hh
pdns/remote_logger.hh
pdns/rpzloader.hh
pdns/syncres.hh

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc pdns/dnsdist.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc pdns/iputils.cc
Simple merge
diff --cc pdns/iputils.hh
Simple merge
diff --cc pdns/misc.cc
Simple merge
diff --cc pdns/misc.hh
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc pdns/syncres.hh
Simple merge