Merge 78295e97b8 into merged_master (Bitcoin PR #15788)

This commit is contained in:
Andrew Poelstra 2020-10-28 16:40:10 +00:00
commit 161bcd2ae8
98 changed files with 322 additions and 302 deletions

View file

@ -1,4 +1,4 @@
// Copyright (c) 2012-2018 The Bitcoin Core developers
// Copyright (c) 2012-2019 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -6,7 +6,7 @@
#include <util/time.h>
#include <validation.h>
#include <test/test_bitcoin.h>
#include <test/setup_common.h>
#include <checkqueue.h>
#include <boost/test/unit_test.hpp>
#include <boost/thread.hpp>