Merge pull request #5181

afd4b94 Move CMerkleBlock and CPartialMerkleTree to their own file (Matt Corallo)
This commit is contained in:
Wladimir J. van der Laan
2014-12-05 16:50:11 +01:00
9 changed files with 318 additions and 294 deletions

View File

@@ -4,15 +4,17 @@
#include "base58.h"
#include "clientversion.h"
#include "primitives/block.h" // for MAX_BLOCK_SIZE
#include "primitives/transaction.h"
#include "core_io.h"
#include "coins.h"
#include "keystore.h"
#include "main.h" // for MAX_BLOCK_SIZE
#include "script/script.h"
#include "script/sign.h"
#include "ui_interface.h" // for _(...)
#include "univalue/univalue.h"
#include "util.h"
#include "utilstrencodings.h"
#include "utilmoneystr.h"
#include <stdio.h>