Commit graph

3 commits

Author SHA1 Message Date
MoneroOcean
7c8b4f72c8 Merge 2019-08-18 15:08:51 -07:00
XMRig
043989e8ee Resolved conflict between argon2 implementations. 2019-08-16 03:18:35 +07:00
XMRig
0c25424a3e Added generic Argon2 implementation (conflicts with RandomX). 2019-08-16 00:31:29 +07:00