mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-17 13:07:54 +02:00
Merge d960d5ca99 into merged_master (Bitcoin PR #16362)
This commit is contained in:
commit
83019c2acd
28 changed files with 264 additions and 200 deletions
|
|
@ -25,10 +25,13 @@
|
|||
#include <util/memory.h>
|
||||
#include <util/strencodings.h>
|
||||
#include <util/time.h>
|
||||
#include <util/translation.h>
|
||||
#include <util/validation.h>
|
||||
#include <validation.h>
|
||||
#include <validationinterface.h>
|
||||
|
||||
#include <functional>
|
||||
|
||||
const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
|
||||
|
||||
FastRandomContext g_insecure_rand_ctx;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue