DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Auto merge of #2082 - str4d:univalue-subtree, r=bitcartel

Browse Source 
Add UniValue as subtree

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6637
- bitcoin/bitcoin#6239
- bitcoin/bitcoin#6379
- bitcoin/bitcoin#6456
- bitcoin/bitcoin#6788
This commit is contained in:
zkbot
2017-02-10 07:46:58 +00:00
parent e51bd1b556 238fec642d
commit eaaa5f625f
118 changed files with 1488 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/transaction_tests.cpp
View File

@@ -27,7 +27,7 @@
#include <boost/test/unit_test.hpp>
#include <boost/assign/list_of.hpp>
#include "univalue/univalue.h"
#include <univalue.h>
#include "zcash/Note.hpp"
#include "zcash/Address.hpp"