Merge remote-tracking branch 'refs/remotes/xmrig/master'

Conflicts:
	CHANGELOG.md
	README.md
This commit is contained in:
BenDroid 2017-11-03 20:22:37 +01:00
commit 64a653c9b0
5 changed files with 142 additions and 227 deletions

View file

@ -53,6 +53,7 @@ set(HEADERS_CRYPTO
src/crypto/groestl_tables.h
src/crypto/hash.h
src/crypto/skein_port.h
src/crypto/soft_aes.h
)
set(SOURCES
@ -83,8 +84,6 @@ set(SOURCES_CRYPTO
src/crypto/c_blake256.c
src/crypto/c_jh.c
src/crypto/c_skein.c
src/crypto/soft_aes.c
src/crypto/soft_aes.c
src/crypto/CryptoNight.cpp
)