From: Peter van Dijk Date: Mon, 27 May 2013 11:48:57 +0000 (+0200) Subject: Merge branch 'use-polarssl-md5' of github.com:cmouse/pdns into cmouse-use-polarssl-md5 X-Git-Tag: auth-3.3-rc1~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8b24bb35f13f929de5b3cbee820b6b395992737;p=pdns Merge branch 'use-polarssl-md5' of github.com:cmouse/pdns into cmouse-use-polarssl-md5 Conflicts: pdns/Makefile.am --- c8b24bb35f13f929de5b3cbee820b6b395992737 diff --cc pdns/Makefile.am index 9028b8cbe,8988cba91..c46d95df3 --- a/pdns/Makefile.am +++ b/pdns/Makefile.am @@@ -243,7 -243,7 +243,7 @@@ dnsdemog_SOURCES=dnsdemog.cc misc.cc un rec_control_SOURCES=rec_channel.cc rec_channel.hh rec_control.cc arguments.cc arguments.hh misc.cc qtype.cc \ unix_utility.cc logger.cc statbag.cc - testrunner_SOURCES=testrunner.cc test-misc_hh.cc test-nameserver_cc.cc test-dnsrecords_cc.cc test-base32_cc.cc \ -testrunner_SOURCES=testrunner.cc test-misc_hh.cc test-nameserver_cc.cc test-dnsrecords_cc.cc test-md5_hh.cc \ ++testrunner_SOURCES=testrunner.cc test-misc_hh.cc test-nameserver_cc.cc test-dnsrecords_cc.cc test-base32_cc.cc test-md5_hh.cc \ nameserver.cc misc.cc \ unix_utility.cc logger.cc statbag.cc arguments.cc qtype.cc dnspacket.cc \ dnswriter.cc base64.cc base32.cc dnsrecords.cc dnslabeltext.cc dnsparser.cc \