Merge branch 'master' into jgrpp

# Conflicts: # src/3rdparty/monocypher/CHANGELOG.md # src/3rdparty/monocypher/CMakeLists.txt # src/3rdparty/monocypher/README.md # src/3rdparty/monocypher/monocypher.h # src/core/random_func.cpp # src/misc.cpp
2024-02-06 18:10:16 +00:00
parent 347862504f bd85f61a40
commit 2208d70e33
13 changed files with 855 additions and 134 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -524,6 +524,7 @@ if(WIN32)
        usp10
        psapi
        winhttp
+        bcrypt
    )
 endif()