Merge branch 'beta' into mergemaster

# Conflicts: # src/main.cpp
2018-04-16 10:16:01 +03:00
parent 9226f69ef1
commit e73b2055c6
910 changed files with 112009 additions and 11364 deletions
--- a/src/crypto/equihash.cpp
+++ b/src/crypto/equihash.cpp
@@ -16,6 +16,7 @@
 #include "config/bitcoin-config.h"
 #endif

+#include "compat/endian.h"
 #include "crypto/equihash.h"
 #include "util.h"
 #ifndef __linux__